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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.281 by root, Mon Jun 5 01:59:59 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 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
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
378 446
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 448 unless $FOCUS;
381} 449}
382 450
383sub mouse_motion { } 451sub mouse_motion { 0 }
384sub button_up { } 452sub button_up { 0 }
385sub key_down { } 453sub key_down { 0 }
386sub key_up { } 454sub key_up { 0 }
387 455
388sub button_down { 456sub button_down {
389 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
390 458
391 $self->focus_in; 459 $self->focus_in;
392}
393 460
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 537
400sub draw { 538sub draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 552
405 glPushMatrix; 553 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 555
410 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 558 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 560 glBegin GL_QUADS;
417 glVertex $x , $y; 561 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
421 glEnd; 565 glEnd;
422 glDisable GL_BLEND; 566 glDisable GL_BLEND;
423 } 567 }
424 568
425 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 570 glPushMatrix;
427 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 574 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
434 glEnd; 578 glEnd;
435 glPopMatrix; 579 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
438} 585}
439 586
440sub _draw { 587sub _draw {
441 my ($self) = @_; 588 my ($self) = @_;
442 589
443 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504} 591}
505 592
506sub DESTROY { 593sub DESTROY {
507 my ($self) = @_; 594 my ($self) = @_;
508 595
… …
540 627
541 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
543 630
544 glEnable GL_BLEND; 631 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 633 glColor_premultiply @$color;
547 634
548 glBegin GL_QUADS; 635 glBegin GL_QUADS;
549 glVertex 0 , 0; 636 glVertex 0 , 0;
550 glVertex 0 , $h; 637 glVertex 0 , $h;
551 glVertex $w, $h; 638 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
568} 655}
569 656
570sub size_request { 657sub size_request {
571 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
572} 661}
573 662
574sub draw { } 663sub draw { }
575 664
576############################################################################# 665#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
581 670
582sub new { 671sub new {
583 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
584 673
585 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
586 675
587 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
588 children => [], 677 children => [],
589 can_events => 0, 678 can_events => 0,
590 %arg, 679 %arg,
591 ); 680 );
681
592 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
593 684
594 $self 685 $self
595} 686}
596 687
597sub add { 688sub add {
… …
605 $self->{children} = [ 696 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
608 ]; 699 ];
609 700
610 $self->check_size (1); 701 $self->realloc;
611 $self->update;
612} 702}
613 703
614sub children { 704sub children {
615 @{ $_[0]{children} } 705 @{ $_[0]{children} }
616} 706}
… …
621 delete $child->{parent}; 711 delete $child->{parent};
622 $child->hide; 712 $child->hide;
623 713
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 715
626 $self->check_size (1); 716 $self->realloc;
627 $self->update;
628} 717}
629 718
630sub clear { 719sub clear {
631 my ($self) = @_; 720 my ($self) = @_;
632 721
… …
636 for (@$children) { 725 for (@$children) {
637 delete $_->{parent}; 726 delete $_->{parent};
638 $_->hide; 727 $_->hide;
639 } 728 }
640 729
641 $self->check_size; 730 $self->realloc;
642 $self->update;
643} 731}
644 732
645sub find_widget { 733sub find_widget {
646 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
647 735
648 $x -= $self->{x}; 736 $x -= $self->{x};
649 $y -= $self->{y}; 737 $y -= $self->{y};
650 738
651 my $res; 739 my $res;
652 740
653 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
655 and return $res; 743 and return $res;
656 } 744 }
657 745
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
708} 796}
709 797
710############################################################################# 798#############################################################################
711 799
800# back-buffered drawing area
801
712package CFClient::UI::Window; 802package CFClient::UI::Window;
713 803
714our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
715 805
716use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 825 $self->update;
736} 826}
737 827
738sub _render { 828sub _render {
829 my ($self) = @_;
830
739 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
740} 832}
741 833
742sub render_child { 834sub render_child {
743 my ($self) = @_; 835 my ($self) = @_;
744 836
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
748 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
749 $self->_render; 848 $self->_render;
750 }; 849 };
751} 850}
752 851
753sub _draw { 852sub _draw {
754 my ($self) = @_; 853 my ($self) = @_;
755 854
756 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
757 856
758 my $tex = $self->{texture} 857 my $tex = $self->{texture}
759 or return; 858 or return;
760 859
761 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
764 863
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 865
767 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
768} 867}
… …
784} 883}
785 884
786sub size_request { 885sub size_request {
787 my ($self) = @_; 886 my ($self) = @_;
788 887
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 889
791 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
792} 894}
793 895
794sub size_allocate { 896sub size_allocate {
795 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
796 898
899 my $child = $self->child;
900
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 903
800 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
801 $self->update; 905 $self->update;
802} 906}
803 907
… …
839} 943}
840 944
841sub _render { 945sub _render {
842 my ($self) = @_; 946 my ($self) = @_;
843 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 952
846 $self->SUPER::_render; 953 $self->SUPER::_render;
847} 954}
848 955
… …
851package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
852 959
853our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
854 961
855sub new { 962sub new {
856 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
857 966
858 my $self; 967 my $self;
859 968
860 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
861 vertical => 1, 970 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 972 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
865 }, 974 },
866 ; 975 ;
867 976
868 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 979 slider => $slider,
871 @_, 980 %arg,
872 ); 981 );
873 982
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
877 985
878 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
879} 993}
880 994
881sub update { 995sub update {
882 my ($self) = @_; 996 my ($self) = @_;
883 997
… …
922 1036
923 if ($self->{bg}) { 1037 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
925 1039
926 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
929 1043
930 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
931 glVertex 0 , 0; 1045 glVertex 0 , 0;
932 glVertex 0 , $h; 1046 glVertex 0 , $h;
933 glVertex $w, $h; 1047 glVertex $w, $h;
… …
946 1060
947our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
948 1062
949use CFClient::OpenGL; 1063use CFClient::OpenGL;
950 1064
951my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1072
955sub new { 1073sub new {
956 my $class = shift; 1074 my ($class, %arg) = @_;
957 1075
958 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
959 1077
960 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1081 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1082 can_events => 1,
966 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
967 ); 1086 );
968 1087
969 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
970 align => 0, 1089 align => 0,
971 valign => 1, 1090 valign => 1,
972 text => $self->{title}, 1091 text => $title,
973 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
974 1094
975 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
976} 1103}
977 1104
978sub border { 1105sub border {
979 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
980} 1107}
981 1108
982sub size_request { 1109sub size_request {
983 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
984 1114
985 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
986 1116
987 ( 1117 (
988 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
991} 1121}
992 1122
993sub size_allocate { 1123sub size_allocate {
994 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
995 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
996 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
998 1136
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1003} 1138}
1004 1139
1005sub button_down { 1140sub button_down {
1006 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1007 1142
… …
1023 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1024 1159
1025 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1027 1162
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1167 $self->realloc;
1032 }; 1168 };
1033 1169
1034 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1174 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1040 1176
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1178
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1046 } 1187 1
1047} 1188}
1048 1189
1049sub button_up { 1190sub button_up {
1050 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1051 1192
1052 delete $self->{motion}; 1193 !!delete $self->{motion}
1053} 1194}
1054 1195
1055sub mouse_motion { 1196sub mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1057 1198
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1059} 1202}
1060 1203
1061sub _draw { 1204sub _draw {
1062 my ($self) = @_; 1205 my ($self) = @_;
1063 1206
1207 my $child = $self->{children}[0];
1208
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1211
1067 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1214
1070 my $border = $self->border; 1215 my $border = $self->border;
1071 1216
1072 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1222
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1080 1225
1081 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1231 }
1092 1232
1093 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1094 1234
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1098} 1241}
1099 1242
1100############################################################################# 1243#############################################################################
1101 1244
1102package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1125 1268
1126 $child->set_parent ($self); 1269 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1128 1271
1129 $self->check_size (1); 1272 $self->realloc;
1130} 1273}
1131 1274
1132# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1276sub clear {
1134 my ($self) = @_; 1277 my ($self) = @_;
… …
1139 for (@children) { 1282 for (@children) {
1140 delete $_->{parent}; 1283 delete $_->{parent};
1141 $_->hide; 1284 $_->hide;
1142 } 1285 }
1143 1286
1144 $self->check_size (1); 1287 $self->realloc;
1145 $self->update;
1146} 1288}
1147 1289
1148sub get_wh { 1290sub get_wh {
1149 my ($self) = @_; 1291 my ($self) = @_;
1150 1292
… …
1246 } 1388 }
1247} 1389}
1248 1390
1249############################################################################# 1391#############################################################################
1250 1392
1251package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1394
1255our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1256 1396
1257sub size_request { 1397sub size_request {
1258 my ($self) = @_; 1398 my ($self) = @_;
1259 1399
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1261 1401 ? (
1262 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1404 )
1265 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1266} 1409}
1267 1410
1268sub size_allocate { 1411sub size_allocate {
1269 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1270 1413
1271 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1415 my $children = $self->{children};
1274 1416
1275 my @h = map $_->{req_w}, @$children; 1417 my @req;
1276 1418
1277 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1278 1420 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1435 }
1293 } 1436 }
1294 1437
1295 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1296 1439
1297 my $y = 0; 1440 my $pos = 0;
1298 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1444
1303 $y += $h; 1445 $pos += $alloc;
1304 } 1446 }
1305 1447
1306 1 1448 1
1307} 1449}
1308 1450
1309############################################################################# 1451#############################################################################
1310 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1311package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1312 1469
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1316 1471
1317sub size_request { 1472sub new {
1318 my ($self) = @_; 1473 my $class = shift;
1319 1474
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1321 1476 vertical => 1,
1322 ( 1477 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1478 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1479}
1366 1480
1367############################################################################# 1481#############################################################################
1368 1482
1369package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1500 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1388 fontsize => 1, 1502 fontsize => 1,
1389 align => -1, 1503 align => -1,
1390 valign => -1, 1504 valign => -1,
1391 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1392 can_events => 0, 1507 can_events => 0,
1393 %arg 1508 %arg
1394 ); 1509 );
1395 1510
1396 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1432 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1433 1548
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1436 1551
1552 $self->realloc;
1437 $self->update; 1553 $self->update;
1438 $self->check_size;
1439} 1554}
1440 1555
1441sub set_markup { 1556sub set_markup {
1442 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1443 1558
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1563
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1451 1566
1567 $self->realloc;
1452 $self->update; 1568 $self->update;
1453 $self->check_size;
1454} 1569}
1455 1570
1456sub size_request { 1571sub size_request {
1457 my ($self) = @_; 1572 my ($self) = @_;
1458 1573
… …
1472 1587
1473 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1475 } 1590 }
1476 1591
1477 ( 1592 ($w, $h)
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1593}
1482 1594
1483sub size_allocate { 1595sub size_allocate {
1484 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1485 1597
1598 delete $self->{ox};
1599
1486 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487} 1602}
1488 1603
1489sub set_fontsize { 1604sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1491 1606
1492 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1608 delete $self->{texture};
1494 1609
1495 $self->update; 1610 $self->realloc;
1496 $self->check_size;
1497} 1611}
1498 1612
1499sub _draw { 1613sub _draw {
1500 my ($self) = @_; 1614 my ($self) = @_;
1501 1615
… …
1507 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1625
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1513 1628
1629 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1517 1633
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1637 };
1524 1638
1525 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527 1641
1642 glColor_premultiply @{$self->{fg}}
1528 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1529 glColor @{$self->{fg}}; 1644
1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else {
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 }
1534 1646
1535 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1536} 1648}
1537 1649
1538############################################################################# 1650#############################################################################
… …
1565 1677
1566 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1567 1679
1568 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1569 1681
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1683 $self->{text} = $text;
1574 1684
1575 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1577 1687
1578 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1579} 1690}
1580 1691
1581sub set_text { 1692sub set_text {
1582 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1583 1694
1584 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1696 $self->_set_text ($text);
1586 $self->update; 1697
1587 $self->check_size; 1698 $self->realloc;
1588} 1699}
1589 1700
1590sub get_text { 1701sub get_text {
1591 $_[0]{text} 1702 $_[0]{text}
1592} 1703}
… …
1622 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1625 } elsif ($uni) { 1736 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1627 } 1740 }
1628 1741
1629 $self->_set_text ($text); 1742 $self->_set_text ($text);
1630 $self->update; 1743
1631 $self->check_size; 1744 $self->realloc;
1745
1746 1
1632} 1747}
1633 1748
1634sub focus_in { 1749sub focus_in {
1635 my ($self) = @_; 1750 my ($self) = @_;
1636 1751
… …
1651 utf8::encode $text; 1766 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1653 1768
1654 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1655 $self->update; 1770 $self->update;
1771
1772 1
1656} 1773}
1657 1774
1658sub mouse_motion { 1775sub mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1661} 1780}
1662 1781
1663sub _draw { 1782sub _draw {
1664 my ($self) = @_; 1783 my ($self) = @_;
1665 1784
1666 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1667 1786
1668 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1671 } else { 1790 } else {
1672 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1673 } 1792 }
1674 1793
1675 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1797 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1742 } else { 1861 } else {
1743 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1744 } 1863 }
1745 1864
1746 } else { 1865 } else {
1747 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1748 } 1869 1
1749
1750} 1870}
1751 1871
1752############################################################################# 1872#############################################################################
1753 1873
1754package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1763 1883
1764sub new { 1884sub new {
1765 my $class = shift; 1885 my $class = shift;
1766 1886
1767 $class->SUPER::new ( 1887 $class->SUPER::new (
1768 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1769 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1771 can_hover => 1, 1892 can_hover => 1,
1772 align => 0, 1893 align => 0,
1773 valign => 0, 1894 valign => 0,
… …
1782 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1783 1904
1784 $self->emit ("activate") 1905 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1787} 1910}
1788 1911
1789sub _draw { 1912sub _draw {
1790 my ($self) = @_; 1913 my ($self) = @_;
1791 1914
1792 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1793
1794 if ($GRAB == $self) {
1795 $self->{fg} = $self->{active_fg};
1796 }
1797 1916
1798 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1801 1920
… …
1820 1939
1821sub new { 1940sub new {
1822 my $class = shift; 1941 my $class = shift;
1823 1942
1824 $class->SUPER::new ( 1943 $class->SUPER::new (
1825 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1826 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1950 state => 0,
… …
1834} 1954}
1835 1955
1836sub size_request { 1956sub size_request {
1837 my ($self) = @_; 1957 my ($self) = @_;
1838 1958
1839 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1840} 1960}
1841 1961
1842sub button_down { 1962sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1844 1964
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1849 } 1973 1
1850} 1974}
1851 1975
1852sub _draw { 1976sub _draw {
1853 my ($self) = @_; 1977 my ($self) = @_;
1854 1978
1855 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1856 1980
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 1982
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 1986
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 1988
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 1990
… …
2019 2145
2020 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2022 2148
2023 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2154
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2136 vertical => 0, 2263 vertical => 0,
2137 can_hover => 1, 2264 can_hover => 1,
2138 inner_pad => 0.02, 2265 inner_pad => 0.02,
2139 @_ 2266 @_
2140 ); 2267 );
… …
2143 $self->update; 2270 $self->update;
2144 2271
2145 $self 2272 $self
2146} 2273}
2147 2274
2275sub changed { }
2276
2148sub set_range { 2277sub set_range {
2149 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2150 2279
2151 ($range, $self->{range}) = ($self->{range}, $range); 2280 ($range, $self->{range}) = ($self->{range}, $range);
2152 2281
… …
2178} 2307}
2179 2308
2180sub size_request { 2309sub size_request {
2181 my ($self) = @_; 2310 my ($self) = @_;
2182 2311
2183 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2313}
2188 2314
2189sub button_down { 2315sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2191 2317
2192 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2193 2319
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2321
2196 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2197} 2323}
2198 2324
2199sub mouse_motion { 2325sub mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2201 2327
… …
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2332
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2334
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2210 } 2340 1
2211} 2341}
2212 2342
2213sub update { 2343sub update {
2214 my ($self) = @_; 2344 my ($self) = @_;
2215 2345
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2218 2355
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2221 2358
… …
2227 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2229 2366
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2232 }); 2369 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2370
2240 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2241 2372
2242 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2243 2374
… …
2437 2568
2438 delete $self->{texture}; 2569 delete $self->{texture};
2439 } 2570 }
2440 2571
2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2442 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2443 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2444 2575
2445 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2446 2577
2447 my $y0 = $top; 2578 my $y0 = $top;
… …
2482sub _draw { 2613sub _draw {
2483 my ($self) = @_; 2614 my ($self) = @_;
2484 2615
2485 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2489 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2490 2621
2491 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2492 2623
2493} 2624}
… …
2542 2673
2543sub new { 2674sub new {
2544 my $class = shift; 2675 my $class = shift;
2545 2676
2546 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2547 state => 0, 2678 state => 0,
2548 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2549 @_ 2680 @_
2550 ); 2681 );
2551 2682
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2683 $self
2558} 2684}
2559 2685
2560sub toggle_flopper { 2686sub toggle_flopper {
2561 my ($self) = @_; 2687 my ($self) = @_;
2562 2688
2563 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2690}
2575 2691
2576############################################################################# 2692#############################################################################
2577 2693
2578package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2591} 2707}
2592 2708
2593sub set_tooltip_from { 2709sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2595 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2596 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2724 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2726 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2738
2614sub size_allocate { 2739sub size_allocate {
2615 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2616 2741
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2618} 2761}
2619 2762
2620sub _draw { 2763sub _draw {
2621 my ($self) = @_; 2764 my ($self) = @_;
2622 2765
… …
2639 glVertex $w, $h; 2782 glVertex $w, $h;
2640 glVertex $w, 0; 2783 glVertex $w, 0;
2641 glEnd; 2784 glEnd;
2642 2785
2643 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2644 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2645} 2789}
2646 2790
2647############################################################################# 2791#############################################################################
2648 2792
… …
2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2708 2852
2709 if ($tex) { 2853 if ($tex) {
2710 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2712 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2714 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2715 } 2859 }
2716} 2860}
2717 2861
… …
2724 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2725} 2869}
2726 2870
2727############################################################################# 2871#############################################################################
2728 2872
2729package CFClient::UI::Inventory; 2873package CFClient::UI::Buttonbar;
2730 2874
2731our @ISA = CFClient::UI::ScrolledWindow::; 2875our @ISA = CFClient::UI::HBox::;
2732 2876
2733sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2878
2774############################################################################# 2879#############################################################################
2775 2880
2776package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2777 2882
… …
2818 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2924 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2821 2926
2822 $self->show; 2927 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2929}
2825 2930
2826sub mouse_motion { 2931sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2828 2933
2829 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2832} 2939}
2833 2940
2834sub button_up { 2941sub button_up {
2835 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2836 2943
… …
2838 undef $GRAB; 2945 undef $GRAB;
2839 $self->hide; 2946 $self->hide;
2840 2947
2841 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2843 } 2954 1
2844} 2955}
2845 2956
2846############################################################################# 2957#############################################################################
2847 2958
2848package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2849 2960
2850our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2851 2962
2852sub new { 2963sub new {
2853 my $class = shift; 2964 my $class = shift;
2854 2965
2855 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2856 fontsize => 0.8, 3075 fontsize => 0.8,
2857 @_, 3076 @_,
2858 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3082
3083 $self
2859} 3084}
2860 3085
2861sub reorder { 3086sub reorder {
2862 my ($self) = @_; 3087 my ($self) = @_;
2863 my $NOW = time; 3088 my $NOW = Time::HiRes::time;
3089
3090 # freeze display when hovering over any label
3091 return if $CFClient::UI::TOOLTIP->{owner}
3092 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3093 values %{ $self->{item} };
2864 3094
2865 while (my ($k, $v) = each %{ $self->{item} }) { 3095 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3096 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 } 3097 }
2868 3098
… …
2871 my @items = sort { 3101 my @items = sort {
2872 $a->{pri} <=> $b->{pri} 3102 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id} 3103 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} }; 3104 } values %{ $self->{item} };
2875 3105
3106 $self->{timer}->interval (1);
3107
2876 my $count = 10 + 1; 3108 my $count = 10 + 1;
2877 for my $item (@items) { 3109 for my $item (@items) {
2878 last unless --$count; 3110 last unless --$count;
2879 3111
2880 push @widgets, $item->{label} ||= do { 3112 my $label = $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all) 3113 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1 3114 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}" 3115 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text}; 3116 : $item->{text};
2885 3117
… …
2893 tooltip => $item->{tooltip}, 3125 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP, 3126 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67, 3127 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize}, 3128 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44, 3129 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg}, 3130 fg => [@{ $item->{fg} }],
2899 can_events => 1, 3131 can_events => 1,
2900 can_hover => 1 3132 can_hover => 1
2901 }; 3133 };
3134
3135 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3136 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3137 $label->update;
3138 $label->set_max_size (undef, $label->{req_h} * $diff)
3139 if $diff < 1;
3140 $self->{timer}->interval (1/30);
3141 } else {
3142 $label->{fg}[3] = $item->{fg}[3] || 1;
3143 }
3144
3145 push @widgets, $label;
2902 } 3146 }
2903 3147
2904 $self->clear; 3148 $self->clear;
2905 $self->SUPER::add (reverse @widgets); 3149 $self->SUPER::add (reverse @widgets);
2906} 3150}
… …
2911 $text =~ s/^\s+//; 3155 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//; 3156 $text =~ s/\s+$//;
2913 3157
2914 return unless $text; 3158 return unless $text;
2915 3159
2916 my $timeout = time + ((delete $arg{timeout}) || 60); 3160 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2917 3161
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3162 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919 3163
2920 if (my $item = $self->{item}{$group}) { 3164 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) { 3165 if ($item->{text} eq $text) {
… …
2951 3195
2952 $self->reorder; 3196 $self->reorder;
2953 $self->SUPER::reconfigure; 3197 $self->SUPER::reconfigure;
2954} 3198}
2955 3199
3200sub DESTROY {
3201 my ($self) = @_;
3202
3203 $self->{timer}->cancel;
3204
3205 $self->SUPER::DESTROY;
3206}
3207
2956############################################################################# 3208#############################################################################
2957 3209
2958package CFClient::UI::Root; 3210package CFClient::UI::Inventory;
2959 3211
2960our @ISA = CFClient::UI::Container::; 3212our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3213
2964sub new { 3214sub new {
2965 my $class = shift; 3215 my $class = shift;
2966 3216
2967 $class->SUPER::new ( 3217 my $self = $class->SUPER::new (
3218 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3219 @_,
3220 );
3221
3222 $self
3223}
3224
3225sub set_items {
3226 my ($self, $items) = @_;
3227
3228 $self->{child}->clear;
3229 return unless $items;
3230
3231 my @items = sort {
3232 ($a->{type} <=> $b->{type})
3233 or ($a->{name} cmp $b->{name})
3234 } @$items;
3235
3236 $self->{real_items} = \@items;
3237
3238 my $row = 0;
3239 for my $item (@items) {
3240 CFClient::Item::update_widgets $item;
3241
3242 $self->{child}->add (0, $row, $item->{face_widget});
3243 $self->{child}->add (1, $row, $item->{desc_widget});
3244 $self->{child}->add (2, $row, $item->{weight_widget});
3245
3246 $row++;
3247 }
3248}
3249
3250#############################################################################
3251
3252package CFClient::UI::BindEditor;
3253
3254our @ISA = CFClient::UI::FancyFrame::;
3255
3256sub new {
3257 my $class = shift;
3258
3259 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3260
3261 $self->add (my $vb = new CFClient::UI::VBox);
3262
3263
3264 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3265 text => "start recording",
3266 tooltip => "Start/Stops recording of actions."
3267 ."All subsequent actions after the recording started will be captured."
3268 ."The actions are displayed after the record was stopped."
3269 ."To bind the action you have to click on the 'Bind' button",
3270 on_activate => sub {
3271 unless ($self->{recording}) {
3272 $self->start;
3273 } else {
3274 $self->stop;
3275 }
3276 });
3277
3278 $vb->add (new CFClient::UI::Label text => "Actions:");
3279 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3280
3281 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3282 $vb->add (my $hb = new CFClient::UI::HBox);
3283 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3284 $hb->add (new CFClient::UI::Button
3285 text => "bind",
3286 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3287 on_activate => sub {
3288 $self->ask_for_bind;
3289 });
3290
3291 $vb->add (my $hb = new CFClient::UI::HBox);
3292 $hb->add (new CFClient::UI::Button
3293 text => "ok",
3294 expand => 1,
3295 tooltip => "This closes the binding editor and saves the binding",
3296 on_activate => sub {
3297 $self->hide;
3298 $self->commit;
3299 });
3300
3301 $hb->add (new CFClient::UI::Button
3302 text => "cancel",
3303 expand => 1,
3304 tooltip => "This closes the binding editor without saving",
3305 on_activate => sub {
3306 $self->hide;
3307 $self->{binding_cancel}->()
3308 if $self->{binding_cancel};
3309 });
3310
3311 $self->update_binding_widgets;
3312
3313 $self
3314}
3315
3316sub commit {
3317 my ($self) = @_;
3318 my ($mod, $sym, $cmds) = $self->get_binding;
3319 if ($sym != 0 && @$cmds > 0) {
3320 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3321 ."'. Don't forget 'Save Config'!");
3322 $self->{binding_change}->($mod, $sym, $cmds)
3323 if $self->{binding_change};
3324 } else {
3325 $::STATUSBOX->add ("No action bound, no key or action specified!");
3326 $self->{binding_cancel}->()
3327 if $self->{binding_cancel};
3328 }
3329}
3330
3331sub start {
3332 my ($self) = @_;
3333
3334 $self->{rec_btn}->set_text ("stop recording");
3335 $self->{recording} = 1;
3336 $self->clear_command_list;
3337 $::CONN->start_record if $::CONN;
3338}
3339
3340sub stop {
3341 my ($self) = @_;
3342
3343 $self->{rec_btn}->set_text ("start recording");
3344 $self->{recording} = 0;
3345
3346 my $rec;
3347 $rec = $::CONN->stop_record if $::CONN;
3348 return unless ref $rec eq 'ARRAY';
3349 $self->set_command_list ($rec);
3350}
3351
3352
3353sub ask_for_bind_and_commit {
3354 my ($self) = @_;
3355 $self->ask_for_bind (1);
3356}
3357
3358sub ask_for_bind {
3359 my ($self, $commit) = @_;
3360
3361 CFClient::Binder::open_binding_dialog (sub {
3362 my ($mod, $sym) = @_;
3363 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3364 $self->update_binding_widgets;
3365 $self->commit if $commit;
3366 });
3367}
3368
3369# $mod and $sym are the modifiers and key symbol
3370# $cmds is a array ref of strings (the commands)
3371# $cb is the callback that is executed on OK
3372# $ccb is the callback that is executed on CANCEL and
3373# when the binding was unsuccessful on OK
3374sub set_binding {
3375 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3376
3377 $self->clear_command_list;
3378 $self->{recording} = 0;
3379 $self->{rec_btn}->set_text ("start recording");
3380
3381 $self->{binding} = [$mod, $sym];
3382 $self->{commands} = $cmds;
3383
3384 $self->{binding_change} = $cb;
3385 $self->{binding_cancel} = $ccb;
3386
3387 $self->update_binding_widgets;
3388}
3389
3390# this is a shortcut method that asks for a binding
3391# and then just binds it.
3392sub do_quick_binding {
3393 my ($self, $cmds) = @_;
3394 $self->set_binding (undef, undef, $cmds, sub {
3395 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3396 });
3397 $self->ask_for_bind (1);
3398}
3399
3400sub update_binding_widgets {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3404 $self->set_command_list ($cmds);
3405}
3406
3407sub get_binding {
3408 my ($self) = @_;
3409 return (
3410 $self->{binding}->[0],
3411 $self->{binding}->[1],
3412 [ grep { defined $_ } @{$self->{commands}} ]
3413 );
3414}
3415
3416sub clear_command_list {
3417 my ($self) = @_;
3418 $self->{cmdbox}->clear ();
3419}
3420
3421sub set_command_list {
3422 my ($self, $cmds) = @_;
3423
3424 $self->{cmdbox}->clear ();
3425 $self->{commands} = $cmds;
3426
3427 my $idx = 0;
3428
3429 for (@$cmds) {
3430 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3431
3432 my $i = $idx;
3433 $hb->add (new CFClient::UI::Label text => $_);
3434 $hb->add (new CFClient::UI::Button
3435 text => "delete",
3436 tooltip => "Deletes the action from the record",
3437 on_activate => sub {
3438 $self->{cmdbox}->remove ($hb);
3439 $cmds->[$i] = undef;
3440 });
3441
3442
3443 $idx++
3444 }
3445}
3446
3447#############################################################################
3448
3449package CFClient::UI::SpellList;
3450
3451our @ISA = CFClient::UI::Table::;
3452
3453sub new {
3454 my $class = shift;
3455
3456 my $self = $class->SUPER::new (
3457 binding => [],
3458 commands => [],
2968 @_, 3459 @_,
2969 ) 3460 )
2970} 3461}
2971 3462
2972sub configure { 3463# XXX: Do sorting? Argl...
2973 my ($self, $x, $y, $w, $h) = @_; 3464sub add_spell {
2974
2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2978
2979sub check_size {
2980 my ($self) = @_; 3465 my ($self, $spell) = @_;
3466 $self->{spells}->{$spell->{name}} = $spell;
2981 3467
2982 $self->size_allocate ($self->{w}, $self->{h}) 3468 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983 if $self->{w}; 3469 face => $spell->{face},
3470 can_hover => 1,
3471 can_events => 1,
3472 tooltip => $spell->{message});
3473
3474 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3475 text => $spell->{name},
3476 can_hover => 1,
3477 can_events => 1,
3478 tooltip => $spell->{message},
3479 expand => 1);
3480
3481 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3482 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3483 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3484 expand => 1);
3485
3486 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3487 text => "bind to key",
3488 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3489}
3490
3491sub rebuild_spell_list {
3492 my ($self) = @_;
3493 $self->{tbl_idx} = 0;
3494 $self->add_spell ($_) for values %{$self->{spells}};
3495}
3496
3497sub remove_spell {
3498 my ($self, $spell) = @_;
3499 delete $self->{spells}->{$spell->{name}};
3500 $self->rebuild_spell_list;
3501}
3502
3503#############################################################################
3504
3505package CFClient::UI::Root;
3506
3507our @ISA = CFClient::UI::Container::;
3508
3509use List::Util qw(min max);
3510
3511use CFClient::OpenGL;
3512
3513sub new {
3514 my $class = shift;
3515
3516 my $self = $class->SUPER::new (
3517 visible => 1,
3518 @_,
3519 );
3520
3521 Scalar::Util::weaken ($self->{root} = $self);
3522
3523 $self
2984} 3524}
2985 3525
2986sub size_request { 3526sub size_request {
2987 my ($self) = @_; 3527 my ($self) = @_;
2988 3528
2989 ($self->{w}, $self->{h}) 3529 ($self->{w}, $self->{h})
3530}
3531
3532sub _to_pixel {
3533 my ($coord, $size, $max) = @_;
3534
3535 $coord =
3536 $coord eq "center" ? ($max - $size) * 0.5
3537 : $coord eq "max" ? $max
3538 : $coord;
3539
3540 $coord = 0 if $coord < 0;
3541 $coord = $max - $size if $coord > $max - $size;
3542
3543 int $coord + 0.5
2990} 3544}
2991 3545
2992sub size_allocate { 3546sub size_allocate {
2993 my ($self, $w, $h) = @_; 3547 my ($self, $w, $h) = @_;
2994 3548
2995 for my $child ($self->children) { 3549 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3550 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3551
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3552 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3553 $Y = $child->{force_y} if exists $child->{force_y};
3000 3554
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3555 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3556 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3557
3007 $child->configure ($X, $Y, $W, $H); 3558 $child->configure ($X, $Y, $W, $H);
3008 } 3559 }
3009} 3560}
3010 3561
… …
3021} 3572}
3022 3573
3023sub update { 3574sub update {
3024 my ($self) = @_; 3575 my ($self) = @_;
3025 3576
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3577 $::WANT_REFRESH++;
3028} 3578}
3029 3579
3030sub add { 3580sub add {
3031 my ($self, @children) = @_; 3581 my ($self, @children) = @_;
3032 3582
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3583 $_->{is_toplevel} = 1
3041 3584 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3585
3047 $self->SUPER::add (@children); 3586 $self->SUPER::add (@children);
3048} 3587}
3049 3588
3050sub remove { 3589sub remove {
3051 my ($self, @children) = @_; 3590 my ($self, @children) = @_;
3052 3591
3053 $self->SUPER::remove (@children); 3592 $self->SUPER::remove (@children);
3593
3594 delete $self->{is_toplevel}
3595 for @children;
3054 3596
3055 while (@children) { 3597 while (@children) {
3056 my $w = pop @children; 3598 my $w = pop @children;
3057 push @children, $w->children; 3599 push @children, $w->children;
3058 $w->set_invisible; 3600 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3619 while ($self->{refresh_hook}) {
3078 $_->() 3620 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3621 for values %{delete $self->{refresh_hook}};
3080 } 3622 }
3081 3623
3082 if ($self->{check_size}) { 3624 if ($self->{realloc}) {
3083 my @queue = ([], []); 3625 my %queue;
3626 my @queue;
3627 my $widget;
3084 3628
3085 for (;;) { 3629 outer:
3086 if ($self->{check_size}) { 3630 while () {
3087 # heuristic: check containers last 3631 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3632 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3633 $widget->{visible} or next; # do not resize invisible widgets
3634
3635 $queue{$widget+0}++ and next; # duplicates are common
3636
3637 push @{ $queue[$widget->{visible}] }, $widget;
3638 }
3090 } 3639 }
3091 3640
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3641 while () {
3642 @queue or last outer;
3093 3643
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3644 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3645 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3646
3647 pop @queue;
3648 }
3649
3650 delete $queue{$widget+0};
3651
3652 my ($w, $h) = $widget->size_request;
3653
3654 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3655 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3656
3657 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3658 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3659
3660 $w = $widget->{force_w} if exists $widget->{force_w};
3661 $h = $widget->{force_h} if exists $widget->{force_h};
3662
3663 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3664 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3665 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3666 $widget->{req_h} = $h;
3104 3667
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3668 $self->{size_alloc}{$widget+0} = $widget;
3106 3669
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3670 if (my $parent = $widget->{parent}) {
3671 $self->{realloc}{$parent+0} = $parent
3672 unless $queue{$parent+0};
3673
3674 $parent->{force_size_alloc} = 1;
3675 $self->{size_alloc}{$parent+0} = $parent;
3676 }
3109 } 3677 }
3678
3679 delete $self->{realloc}{$widget+0};
3110 } 3680 }
3111 } 3681 }
3112 3682
3113 while ($self->{size_alloc}) { 3683 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3684 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3685 values %$size_alloc;
3686
3687 while () {
3688 my $widget = pop @queue || last;
3689
3690 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3691
3117 $w = 0 if $w < 0; 3692 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3693 $h = 0 if $h < 0;
3119 3694
3695 $w = int $w + 0.5;
3696 $h = int $h + 0.5;
3697
3698 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3699 $widget->{old_w} = $widget->{w};
3700 $widget->{old_h} = $widget->{h};
3701
3120 $widget->{w} = $w; 3702 $widget->{w} = $w;
3121 $widget->{h} = $h; 3703 $widget->{h} = $h;
3704
3122 $widget->emit (size_allocate => $w, $h); 3705 $widget->emit (size_allocate => $w, $h);
3706 }
3123 } 3707 }
3124 } 3708 }
3125 3709
3126 while ($self->{post_alloc_hook}) { 3710 while ($self->{post_alloc_hook}) {
3127 $_->() 3711 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3712 for values %{delete $self->{post_alloc_hook}};
3129 } 3713 }
3714
3130 3715
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3716 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3717 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3718 glClear GL_COLOR_BUFFER_BIT;
3134 3719
… …
3136 glLoadIdentity; 3721 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3722 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3723 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3724 glLoadIdentity;
3140 3725
3726 {
3727 package CFClient::UI::Base;
3728
3729 ($draw_x, $draw_y, $draw_w, $draw_h) =
3730 (0, 0, $self->{w}, $self->{h});
3731 }
3732
3141 $self->_draw; 3733 $self->_draw;
3142} 3734}
3143 3735
3144############################################################################# 3736#############################################################################
3145 3737

Diff Legend

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