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.258 by root, Tue May 30 02:55:45 2006 UTC vs.
Revision 1.329 by root, Sun Jul 23 02:44:06 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
15our $ROOT; 16our $ROOT;
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
21
22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23 if (!$GRAB) {
24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25 if (length $widget->{tooltip}) {
26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
32
33 my $tip = $widget->{tooltip};
34
35 $tip = $tip->($widget) if CODE:: eq ref $tip;
36
37 $TOOLTIP->set_tooltip_from ($widget);
38 $TOOLTIP->show;
39 }
40
41 return;
42 }
43 }
44 }
45
46 $TOOLTIP->hide;
47 delete $TOOLTIP->{owner};
48});
20 49
21sub get_layout { 50sub get_layout {
22 my $layout; 51 my $layout;
23 52
24 for (grep { $_->{name} } values %WIDGET) { 53 for (grep { $_->{name} } values %WIDGET) {
… …
39 my ($layout) = @_; 68 my ($layout) = @_;
40 69
41 $LAYOUT = $layout; 70 $LAYOUT = $layout;
42} 71}
43 72
44sub check_tooltip {
45 if (!$GRAB) {
46 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
47 if (length $widget->{tooltip}) {
48
49 if ($TOOLTIP->{owner} != $widget) {
50 $TOOLTIP->hide;
51
52 $TOOLTIP->{owner} = $widget;
53
54 my $tip = $widget->{tooltip};
55
56 $tip = $tip->($widget) if CODE:: eq ref $tip;
57
58 $TOOLTIP->set_tooltip_from ($widget);
59 $TOOLTIP->show;
60 }
61
62 return;
63 }
64 }
65 }
66
67 $TOOLTIP->hide;
68 delete $TOOLTIP->{owner};
69}
70
71# class methods for events 73# class methods for events
72sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
73 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
74 if $FOCUS; 76 if $FOCUS;
75} 77}
… …
87 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
88 90
89 $GRAB = $widget; 91 $GRAB = $widget;
90 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
91 93
92 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
93 } 95 }
94 96
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 98
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
112 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 116 $grab->update if $grab;
115 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
116 118
117 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
118 } 120 }
119} 121}
120 122
121sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
122 my ($ev) = @_; 124 my ($ev) = @_;
… …
128 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
129 131
130 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
131 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
132 134
133 check_tooltip; 135 $TOOLTIP_WATCHER->start;
134 } 136 }
135 137
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 139 if $HOVER;
138} 140}
… …
170sub rescale_widgets { 172sub rescale_widgets {
171 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
172 174
173 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 179
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $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}; 181 $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}; 182 $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.]+$/; 183 $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}; 184 $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}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 186
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 189
188 } 190 }
189 } 191 }
190 192
191 reconfigure_widgets; 193 reconfigure_widgets;
… …
219 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
220 } 222 }
221 } 223 }
222 224
223 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
224 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x}; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
225 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y}; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
226 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w}; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
227 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h}; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
228 230
229 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x}; 231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
230 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y}; 232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
231 233
232 $self->show if $layout->{show}; 234 $self->show if $layout->{show};
… …
270 272
271 return unless $self->{visible}; 273 return unless $self->{visible};
272 274
273 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
274 276
277 delete $self->{visible};
275 delete $self->{root}; 278 delete $self->{root};
276 delete $self->{visible};
277 279
278 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
280 282
281 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
283 285
284 $self->focus_out; 286 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
287} 288}
288 289
289sub set_visibility { 290sub set_visibility {
290 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
313} 314}
314 315
315sub move_abs { 316sub move_abs {
316 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
317 318
318 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
319 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
321 322
322 $self->update; 323 $self->update;
323} 324}
324 325
… …
332} 333}
333 334
334sub size_request { 335sub size_request {
335 require Carp; 336 require Carp;
336 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
338}
339
340sub baseline_shift {
341 0
337} 342}
338 343
339sub configure { 344sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
341 346
… …
355 $self->{x} = $x; 360 $self->{x} = $x;
356 $self->{y} = $y; 361 $self->{y} = $y;
357 $self->update; 362 $self->update;
358 } 363 }
359 364
360 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
361 return unless $self->{visible}; 366 return unless $self->{visible};
362 367
368 $self->{alloc_w} = $w;
369 $self->{alloc_h} = $h;
370
363 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 371 $self->{root}{size_alloc}{$self+0} = $self;
364 } 372 }
365}
366
367sub size_allocate {
368 # nothing to be done
369} 373}
370 374
371sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
372} 381}
373 382
374sub set_max_size { 383sub set_max_size {
375 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
376 385
377 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
378 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
379} 390}
380 391
381sub set_tooltip { 392sub set_tooltip {
382 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
383 394
… …
388 399
389 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
390 401
391 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
392 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
393 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
394 } 405 }
395} 406}
396 407
397# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
398sub coord2local { 409sub coord2local {
… …
406 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
407 418
408 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
409} 420}
410 421
411sub focus_in { 422sub invoke_focus_in {
412 my ($self) = @_; 423 my ($self) = @_;
413 424
414 return if $FOCUS == $self; 425 return if $FOCUS == $self;
415 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
416 427
417 my $focus = $FOCUS; $FOCUS = $self; 428 $FOCUS = $self;
418 429
419 $self->_emit (focus_in => $focus); 430 $self->update;
420 431
421 $focus->update if $focus; 432 0
422 $FOCUS->update;
423} 433}
424 434
425sub focus_out { 435sub invoke_focus_out {
426 my ($self) = @_; 436 my ($self) = @_;
427 437
428 return unless $FOCUS == $self; 438 return unless $FOCUS == $self;
429 439
430 my $focus = $FOCUS; undef $FOCUS; 440 undef $FOCUS;
431 441
432 $self->_emit (focus_out => $focus); 442 $self->update;
433 443
434 $focus->update if $focus; #?
435
436 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 444 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
437 unless $FOCUS; 445 unless $FOCUS;
438}
439 446
447 0
448}
449
450sub grab_focus {
451 my ($self) = @_;
452
453 $FOCUS->emit ("focus_out") if $FOCUS;
454 $self->emit ("focus_in");
455}
456
440sub mouse_motion { } 457sub invoke_mouse_motion { 0 }
441sub button_up { } 458sub invoke_button_up { 0 }
442sub key_down { } 459sub invoke_key_down { 0 }
443sub key_up { } 460sub invoke_key_up { 0 }
444 461
445sub button_down { 462sub invoke_button_down {
446 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
447 464
448 $self->focus_in; 465 $self->grab_focus;
449}
450 466
451sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 0
452sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
453sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
454sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
455sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
480
481 #d##TODO# stop propagating at first true, do not use sum
482 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
483 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
484 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
485}
456 486
457sub find_widget { 487sub find_widget {
458 my ($self, $x, $y) = @_; 488 my ($self, $x, $y) = @_;
459 489
460 return () unless $self->{can_events}; 490 return () unless $self->{can_events};
… …
471 501
472 Scalar::Util::weaken ($self->{parent} = $parent); 502 Scalar::Util::weaken ($self->{parent} = $parent);
473 $self->set_visible if $parent->{visible}; 503 $self->set_visible if $parent->{visible};
474} 504}
475 505
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493}
494
495sub visibility_change {
496 #my ($self, $visible) = @_;
497}
498
499sub realloc { 506sub realloc {
500 my ($self) = @_; 507 my ($self) = @_;
501 508
502 if ($self->{visible}) { 509 if ($self->{visible}) {
503 return if $self->{root}{realloc}{$self}; 510 return if $self->{root}{realloc}{$self+0};
504 511
505 $self->{root}{realloc}{$self} = $self; 512 $self->{root}{realloc}{$self+0} = $self;
506 $self->{root}->update; 513 $self->{root}->update;
507 } else { 514 } else {
508 delete $self->{req_w}; 515 delete $self->{req_w};
516 delete $self->{req_h};
509 } 517 }
510} 518}
511 519
512sub update { 520sub update {
513 my ($self) = @_; 521 my ($self) = @_;
… …
521 529
522 $self->realloc; 530 $self->realloc;
523 $self->update; 531 $self->update;
524} 532}
525 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
537
526sub draw { 538sub draw {
527 my ($self) = @_; 539 my ($self) = @_;
528 540
529 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
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
530 550
531 glPushMatrix; 551 glPushMatrix;
532 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
533 $self->_draw;
534 glPopMatrix;
535 553
536 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
537 my ($x, $y) = @$self{qw(x y)};
538
539 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
540 glEnable GL_BLEND; 556 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 558 glBegin GL_QUADS;
543 glVertex $x , $y; 559 glVertex 0 , 0;
544 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
545 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
546 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
547 glEnd; 563 glEnd;
548 glDisable GL_BLEND; 564 glDisable GL_BLEND;
549 } 565 }
550 566
551 if ($ENV{CFPLUS_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
552 glPushMatrix; 568 glPushMatrix;
553 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
554 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
555 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
556 glVertex 0 , 0; 572 glVertex 0 , 0;
557 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
558 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
559 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
560 glEnd; 576 glEnd;
561 glPopMatrix; 577 glPopMatrix;
562 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
563 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
564} 583}
565 584
566sub _draw { 585sub _draw {
567 my ($self) = @_; 586 my ($self) = @_;
568 587
… …
570} 589}
571 590
572sub DESTROY { 591sub DESTROY {
573 my ($self) = @_; 592 my ($self) = @_;
574 593
594 return if CFClient::in_destruct;
595
575 delete $WIDGET{$self+0}; 596 delete $WIDGET{$self+0};
576 #$self->deactivate; 597
598 eval { $self->destroy };
599 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
577} 600}
578 601
579############################################################################# 602#############################################################################
580 603
581package CFClient::UI::DrawBG; 604package CFClient::UI::DrawBG;
… …
606 629
607 if ($color && (@$color < 4 || $color->[3])) { 630 if ($color && (@$color < 4 || $color->[3])) {
608 my ($w, $h) = @$self{qw(w h)}; 631 my ($w, $h) = @$self{qw(w h)};
609 632
610 glEnable GL_BLEND; 633 glEnable GL_BLEND;
611 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 634 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612 glColor @$color; 635 glColor_premultiply @$color;
613 636
614 glBegin GL_QUADS; 637 glBegin GL_QUADS;
615 glVertex 0 , 0; 638 glVertex 0 , 0;
616 glVertex 0 , $h; 639 glVertex 0 , $h;
617 glVertex $w, $h; 640 glVertex $w, $h;
… …
648our @ISA = CFClient::UI::Base::; 671our @ISA = CFClient::UI::Base::;
649 672
650sub new { 673sub new {
651 my ($class, %arg) = @_; 674 my ($class, %arg) = @_;
652 675
653 my $children = delete $arg{children} || []; 676 my $children = delete $arg{children};
654 677
655 my $self = $class->SUPER::new ( 678 my $self = $class->SUPER::new (
656 children => [], 679 children => [],
657 can_events => 0, 680 can_events => 0,
658 %arg, 681 %arg,
659 ); 682 );
683
660 $self->add ($_) for @$children; 684 $self->add (@$children)
685 if $children;
661 686
662 $self 687 $self
663} 688}
664 689
665sub add { 690sub add {
… …
713 $x -= $self->{x}; 738 $x -= $self->{x};
714 $y -= $self->{y}; 739 $y -= $self->{y};
715 740
716 my $res; 741 my $res;
717 742
718 for (reverse @{ $self->{children} }) { 743 for (reverse $self->visible_children) {
719 $res = $_->find_widget ($x, $y) 744 $res = $_->find_widget ($x, $y)
720 and return $res; 745 and return $res;
721 } 746 }
722 747
723 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 748 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
744} 769}
745 770
746sub add { 771sub add {
747 my ($self, $child) = @_; 772 my ($self, $child) = @_;
748 773
749 $self->{children} = []; 774 $self->SUPER::remove ($_) for @{ $self->{children} };
750
751 $self->SUPER::add ($child); 775 $self->SUPER::add ($child);
752} 776}
753 777
754sub remove { 778sub remove {
755 my ($self, $widget) = @_; 779 my ($self, $widget) = @_;
… …
764 788
765sub size_request { 789sub size_request {
766 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
767} 791}
768 792
769sub size_allocate { 793sub invoke_size_allocate {
770 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
771 795
772 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
797
798 1
773} 799}
774 800
775############################################################################# 801#############################################################################
802
803# back-buffered drawing area
776 804
777package CFClient::UI::Window; 805package CFClient::UI::Window;
778 806
779our @ISA = CFClient::UI::Bin::; 807our @ISA = CFClient::UI::Bin::;
780 808
… …
791 819
792 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 820 $ROOT->on_post_alloc ($self => sub { $self->render_child });
793 $self->SUPER::update; 821 $self->SUPER::update;
794} 822}
795 823
796sub size_allocate { 824sub invoke_size_allocate {
797 my ($self, $w, $h, $changed) = @_; 825 my ($self, $w, $h) = @_;
798 826
799 $self->SUPER::size_allocate ($w, $h, $changed);
800 $self->update 827 $self->update;
801 if $changed; 828
829 $self->SUPER::invoke_size_allocate ($w, $h)
802} 830}
803 831
804sub _render { 832sub _render {
833 my ($self) = @_;
834
805 $_[0]{children}[0]->draw; 835 $self->{children}[0]->draw;
806} 836}
807 837
808sub render_child { 838sub render_child {
809 my ($self) = @_; 839 my ($self) = @_;
810 840
811 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 841 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
812 glClearColor 0, 0, 0, 0; 842 glClearColor 0, 0, 0, 0;
813 glClear GL_COLOR_BUFFER_BIT; 843 glClear GL_COLOR_BUFFER_BIT;
814 844
845 {
846 package CFClient::UI::Base;
847
848 ($draw_x, $draw_y, $draw_w, $draw_h) =
849 (0, 0, $self->{w}, $self->{h});
850 }
851
815 $self->_render; 852 $self->_render;
816 }; 853 };
817} 854}
818 855
819sub _draw { 856sub _draw {
820 my ($self) = @_; 857 my ($self) = @_;
821 858
822 my ($w, $h) = ($self->w, $self->h); 859 my ($w, $h) = @$self{qw(w h)};
823 860
824 my $tex = $self->{texture} 861 my $tex = $self->{texture}
825 or return; 862 or return;
826 863
827 glEnable GL_TEXTURE_2D; 864 glEnable GL_TEXTURE_2D;
828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 865 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
829 glColor 1, 1, 1, 1; 866 glColor 0, 0, 0, 1;
830 867
831 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 868 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
832 869
833 glDisable GL_TEXTURE_2D; 870 glDisable GL_TEXTURE_2D;
834} 871}
… …
850} 887}
851 888
852sub size_request { 889sub size_request {
853 my ($self) = @_; 890 my ($self) = @_;
854 891
855 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 892 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
856 893
857 $w = 10 if $self->{scroll_x}; 894 $w = 10 if $self->{scroll_x};
858 $h = 10 if $self->{scroll_y}; 895 $h = 10 if $self->{scroll_y};
859 896
860 ($w, $h) 897 ($w, $h)
861} 898}
862 899
863sub size_allocate { 900sub invoke_size_allocate {
864 my ($self, $w, $h, $changed) = @_; 901 my ($self, $w, $h) = @_;
865 902
903 my $child = $self->child;
904
866 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 905 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
867 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 906 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
868 907
869 $self->child->configure (0, 0, $w, $h); 908 $self->child->configure (0, 0, $w, $h);
870 $self->update; 909 $self->update;
910
911 1
871} 912}
872 913
873sub set_offset { 914sub set_offset {
874 my ($self, $x, $y) = @_; 915 my ($self, $x, $y) = @_;
875 916
… …
908} 949}
909 950
910sub _render { 951sub _render {
911 my ($self) = @_; 952 my ($self) = @_;
912 953
954 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
955 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
956
913 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 957 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
914 958
915 $self->SUPER::_render; 959 $self->SUPER::_render;
916} 960}
917 961
… …
920package CFClient::UI::ScrolledWindow; 964package CFClient::UI::ScrolledWindow;
921 965
922our @ISA = CFClient::UI::HBox::; 966our @ISA = CFClient::UI::HBox::;
923 967
924sub new { 968sub new {
925 my $class = shift; 969 my ($class, %arg) = @_;
970
971 my $child = delete $arg{child};
926 972
927 my $self; 973 my $self;
928 974
929 my $slider = new CFClient::UI::Slider 975 my $slider = new CFClient::UI::Slider
930 vertical => 1, 976 vertical => 1,
… …
935 ; 981 ;
936 982
937 $self = $class->SUPER::new ( 983 $self = $class->SUPER::new (
938 vp => (new CFClient::UI::ViewPort expand => 1), 984 vp => (new CFClient::UI::ViewPort expand => 1),
939 slider => $slider, 985 slider => $slider,
940 @_, 986 %arg,
941 ); 987 );
942 988
943 $self->{vp}->add ($self->{scrolled});
944 $self->add ($self->{vp});
945 $self->add ($self->{slider}); 989 $self->SUPER::add ($self->{vp}, $self->{slider});
990 $self->add ($child) if $child;
946 991
947 $self 992 $self
948} 993}
949 994
995#TODO# update range on size_allocate depending on child
996
997sub add {
998 my ($self, $widget) = @_;
999
1000 $self->{vp}->add ($self->{child} = $widget);
1001}
1002
1003sub invoke_button_up {
1004 my ($self, $ev) = @_;
1005
1006 warn "button up $ev->{button}\n";#d#
1007
1008 0
1009}
1010
1011sub update_slider {
1012 my ($self) = @_;
1013
1014 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1015}
1016
950sub update { 1017sub update {
951 my ($self) = @_; 1018 my ($self) = @_;
952 1019
953 $self->SUPER::update; 1020 $self->SUPER::update;
954 1021
955 # todo: overwrite size_allocate of child 1022 $self->update_slider;
956 my $child = $self->{vp}->child;
957 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
958} 1023}
959 1024
960sub size_allocate { 1025sub invoke_size_allocate {
961 my ($self, $w, $h, $changed) = @_; 1026 my ($self, $w, $h) = @_;
962 1027
1028 $self->update_slider;
1029
963 $self->SUPER::size_allocate ($w, $h, $changed); 1030 $self->SUPER::invoke_size_allocate ($w, $h)
964
965 my $child = $self->{vp}->child;
966 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
967} 1031}
968
969#TODO# update range on size_allocate depending on child
970# update viewport offset on scroll
971 1032
972############################################################################# 1033#############################################################################
973 1034
974package CFClient::UI::Frame; 1035package CFClient::UI::Frame;
975 1036
… …
991 1052
992 if ($self->{bg}) { 1053 if ($self->{bg}) {
993 my ($w, $h) = @$self{qw(w h)}; 1054 my ($w, $h) = @$self{qw(w h)};
994 1055
995 glEnable GL_BLEND; 1056 glEnable GL_BLEND;
996 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1057 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
997 glColor @{ $self->{bg} }; 1058 glColor_premultiply @{ $self->{bg} };
998 1059
999 glBegin GL_QUADS; 1060 glBegin GL_QUADS;
1000 glVertex 0 , 0; 1061 glVertex 0 , 0;
1001 glVertex 0 , $h; 1062 glVertex 0 , $h;
1002 glVertex $w, $h; 1063 glVertex $w, $h;
… …
1024my @border = 1085my @border =
1025 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1086 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1026 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1087 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1027 1088
1028sub new { 1089sub new {
1029 my $class = shift; 1090 my ($class, %arg) = @_;
1030 1091
1031 my $self = $class->SUPER::new ( 1092 my $self = $class->SUPER::new (
1032 bg => [1, 1, 1, 1], 1093 bg => [1, 1, 1, 1],
1033 border_bg => [1, 1, 1, 1], 1094 border_bg => [1, 1, 1, 1],
1034 border => 0.6, 1095 border => 0.6,
1035 can_events => 1, 1096 can_events => 1,
1036 min_w => 16, 1097 min_w => 64,
1037 min_h => 16, 1098 min_h => 32,
1038 @_ 1099 %arg,
1039 ); 1100 );
1040 1101
1041 $self->{title} &&= new CFClient::UI::Label 1102 $self->{title_widget} = new CFClient::UI::Label
1042 align => 0, 1103 align => 0,
1043 valign => 1, 1104 valign => 1,
1044 text => $self->{title}, 1105 text => $self->{title},
1045 fontsize => $self->{border}; 1106 fontsize => $self->{border},
1107 if exists $self->{title};
1108
1109 if ($self->{has_close_button}) {
1110 $self->{close_button} =
1111 new CFClient::UI::ImageButton
1112 path => 'x1_close.png',
1113 on_activate => sub { $self->emit ("delete") };
1114
1115 $self->CFClient::UI::Container::add ($self->{close_button});
1116 }
1046 1117
1047 $self 1118 $self
1119}
1120
1121sub add {
1122 my ($self, @widgets) = @_;
1123
1124 $self->SUPER::add (@widgets);
1125 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1126 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1048} 1127}
1049 1128
1050sub border { 1129sub border {
1051 int $_[0]{border} * $::FONTSIZE 1130 int $_[0]{border} * $::FONTSIZE
1052} 1131}
1053 1132
1054sub size_request { 1133sub size_request {
1055 my ($self) = @_; 1134 my ($self) = @_;
1135
1136 $self->{title_widget}->size_request
1137 if $self->{title_widget};
1138
1139 $self->{close_button}->size_request
1140 if $self->{close_button};
1056 1141
1057 my ($w, $h) = $self->SUPER::size_request; 1142 my ($w, $h) = $self->SUPER::size_request;
1058 1143
1059 ( 1144 (
1060 $w + $self->border * 2, 1145 $w + $self->border * 2,
1061 $h + $self->border * 2, 1146 $h + $self->border * 2,
1062 ) 1147 )
1063} 1148}
1064 1149
1065sub size_allocate { 1150sub invoke_size_allocate {
1066 my ($self, $w, $h, $changed) = @_; 1151 my ($self, $w, $h) = @_;
1067 1152
1068 return unless $changed; 1153 if ($self->{title_widget}) {
1154 $self->{title_widget}{w} = $w;
1155 $self->{title_widget}{h} = $h;
1156 $self->{title_widget}->invoke_size_allocate ($w, $h);
1157 }
1069 1158
1159 my $border = $self->border;
1160
1070 $h -= List::Util::max 0, $self->border * 2; 1161 $h -= List::Util::max 0, $border * 2;
1071 $w -= List::Util::max 0, $self->border * 2; 1162 $w -= List::Util::max 0, $border * 2;
1072 1163
1073 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1074 if $self->{title};
1075
1076 $self->child->configure ($self->border, $self->border, $w, $h); 1164 $self->child->configure ($border, $border, $w, $h);
1077}
1078 1165
1166 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1167 if $self->{close_button};
1168
1169 1
1170}
1171
1172sub invoke_delete {
1173 my ($self) = @_;
1174
1175 $self->hide;
1176
1177 1
1178}
1179
1079sub button_down { 1180sub invoke_button_down {
1080 my ($self, $ev, $x, $y) = @_; 1181 my ($self, $ev, $x, $y) = @_;
1081 1182
1082 my ($w, $h) = @$self{qw(w h)}; 1183 my ($w, $h) = @$self{qw(w h)};
1083 my $border = $self->border; 1184 my $border = $self->border;
1084 1185
… …
1100 my $dy = $ev->{y} - $oy; 1201 my $dy = $ev->{y} - $oy;
1101 1202
1102 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1203 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1103 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1204 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1104 1205
1206 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1105 $self->realloc; 1207 $self->realloc;
1106 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1107 }; 1208 };
1108 1209
1109 } elsif ($lr ^ $td) { 1210 } elsif ($lr ^ $td) {
1110 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1111 my ($bx, $by) = ($self->{x}, $self->{y}); 1212 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1114 my ($ev, $x, $y) = @_; 1215 my ($ev, $x, $y) = @_;
1115 1216
1116 ($x, $y) = ($ev->{x}, $ev->{y}); 1217 ($x, $y) = ($ev->{x}, $ev->{y});
1117 1218
1118 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1219 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1220 # HACK: the next line is required to enforce placement
1221 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1119 }; 1222 };
1223 } else {
1224 return 0;
1225 }
1226
1120 } 1227 1
1121} 1228}
1122 1229
1123sub button_up { 1230sub invoke_button_up {
1124 my ($self, $ev, $x, $y) = @_; 1231 my ($self, $ev, $x, $y) = @_;
1125 1232
1126 delete $self->{motion}; 1233 ! ! delete $self->{motion}
1127} 1234}
1128 1235
1129sub mouse_motion { 1236sub invoke_mouse_motion {
1130 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
1131 1238
1132 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1239 $self->{motion}->($ev, $x, $y) if $self->{motion};
1240
1241 ! ! $self->{motion}
1133} 1242}
1134 1243
1135sub _draw { 1244sub _draw {
1136 my ($self) = @_; 1245 my ($self) = @_;
1137 1246
1247 my $child = $self->{children}[0];
1248
1138 my ($w, $h ) = ($self->{w}, $self->{h}); 1249 my ($w, $h ) = ($self->{w}, $self->{h});
1139 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1250 my ($cw, $ch) = ($child->{w}, $child->{h});
1140 1251
1141 glEnable GL_TEXTURE_2D; 1252 glEnable GL_TEXTURE_2D;
1142 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1253 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1143 1254
1144 my $border = $self->border; 1255 my $border = $self->border;
… …
1159 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1270 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1160 } 1271 }
1161 1272
1162 glDisable GL_TEXTURE_2D; 1273 glDisable GL_TEXTURE_2D;
1163 1274
1164 $self->{title}->draw if $self->{title};
1165
1166 $self->child->draw; 1275 $child->draw;
1276
1277 if ($self->{title_widget}) {
1278 glTranslate 0, $border - $self->{h};
1279 $self->{title_widget}->_draw;
1280
1281 glTranslate 0, - ($border - $self->{h});
1282 }
1283
1284 $self->{close_button}->draw
1285 if $self->{close_button};
1167} 1286}
1168 1287
1169############################################################################# 1288#############################################################################
1170 1289
1171package CFClient::UI::Table; 1290package CFClient::UI::Table;
… …
1194 1313
1195 $child->set_parent ($self); 1314 $child->set_parent ($self);
1196 $self->{children}[$y][$x] = $child; 1315 $self->{children}[$y][$x] = $child;
1197 1316
1198 $self->realloc; 1317 $self->realloc;
1318}
1319
1320sub remove {
1321 my ($self, $child) = @_;
1322
1323 # TODO: not yet implemented
1199} 1324}
1200 1325
1201# TODO: move to container class maybe? send children a signal on removal? 1326# TODO: move to container class maybe? send children a signal on removal?
1202sub clear { 1327sub clear {
1203 my ($self) = @_; 1328 my ($self) = @_;
… …
1244 (sum @$ws), 1369 (sum @$ws),
1245 (sum @$hs), 1370 (sum @$hs),
1246 ) 1371 )
1247} 1372}
1248 1373
1249sub size_allocate { 1374sub invoke_size_allocate {
1250 my ($self, $w, $h, $changed) = @_; 1375 my ($self, $w, $h) = @_;
1251 1376
1252 my ($ws, $hs) = $self->get_wh; 1377 my ($ws, $hs) = $self->get_wh;
1253 1378
1254 my $req_w = (sum @$ws) || 1; 1379 my $req_w = (sum @$ws) || 1;
1255 my $req_h = (sum @$hs) || 1; 1380 my $req_h = (sum @$hs) || 1;
… …
1286 } 1411 }
1287 1412
1288 $y += $row_h; 1413 $y += $row_h;
1289 } 1414 }
1290 1415
1416 1
1291} 1417}
1292 1418
1293sub find_widget { 1419sub find_widget {
1294 my ($self, $x, $y) = @_; 1420 my ($self, $x, $y) = @_;
1295 1421
… …
1332 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1458 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1333 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1459 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1334 ) 1460 )
1335} 1461}
1336 1462
1337sub size_allocate { 1463sub invoke_size_allocate {
1338 my ($self, $w, $h, $changed) = @_; 1464 my ($self, $w, $h) = @_;
1339 1465
1340 my $space = $self->{vertical} ? $h : $w; 1466 my $space = $self->{vertical} ? $h : $w;
1341 my $children = $self->{children}; 1467 my @children = $self->visible_children;
1342 1468
1343 my @req; 1469 my @req;
1344 1470
1345 if ($self->{homogeneous}) { 1471 if ($self->{homogeneous}) {
1346 @req = ($space / (@$children || 1)) x @$children; 1472 @req = ($space / (@children || 1)) x @children;
1347 } else { 1473 } else {
1348 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1474 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1349 my $req = List::Util::sum @req; 1475 my $req = List::Util::sum @req;
1350 1476
1351 if ($req > $space) { 1477 if ($req > $space) {
1352 # ah well, not enough space 1478 # ah well, not enough space
1353 $_ *= $space / $req for @req; 1479 $_ *= $space / $req for @req;
1354 } else { 1480 } else {
1355 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1481 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1356 1482
1357 $space = ($space - $req) / $expand; # remaining space to give away 1483 $space = ($space - $req) / $expand; # remaining space to give away
1358 1484
1359 $req[$_] += $space * $children->[$_]{expand} 1485 $req[$_] += $space * $children[$_]{expand}
1360 for 0 .. $#$children; 1486 for 0 .. $#children;
1361 } 1487 }
1362 } 1488 }
1363 1489
1364 CFClient::UI::harmonize \@req; 1490 CFClient::UI::harmonize \@req;
1365 1491
1366 my $pos = 0; 1492 my $pos = 0;
1367 for (0 .. $#$children) { 1493 for (0 .. $#children) {
1368 my $alloc = $req[$_]; 1494 my $alloc = $req[$_];
1369 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1495 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1370 1496
1371 $pos += $alloc; 1497 $pos += $alloc;
1372 } 1498 }
1373 1499
1374 1 1500 1
… …
1464 1590
1465 delete $self->{texture}; 1591 delete $self->{texture};
1466 $self->SUPER::update; 1592 $self->SUPER::update;
1467} 1593}
1468 1594
1595sub realloc {
1596 my ($self) = @_;
1597
1598 delete $self->{ox};
1599 $self->SUPER::realloc;
1600}
1601
1469sub set_text { 1602sub set_text {
1470 my ($self, $text) = @_; 1603 my ($self, $text) = @_;
1471 1604
1472 return if $self->{text} eq "T$text"; 1605 return if $self->{text} eq "T$text";
1473 $self->{text} = "T$text"; 1606 $self->{text} = "T$text";
1474 1607
1475 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1476 $self->{layout}->set_text ($text); 1608 $self->{layout}->set_text ($text);
1477 1609
1610 delete $self->{size_req};
1478 $self->realloc; 1611 $self->realloc;
1479 $self->update; 1612 $self->update;
1480} 1613}
1481 1614
1482sub set_markup { 1615sub set_markup {
… …
1485 return if $self->{text} eq "M$markup"; 1618 return if $self->{text} eq "M$markup";
1486 $self->{text} = "M$markup"; 1619 $self->{text} = "M$markup";
1487 1620
1488 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1621 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1489 1622
1490 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1491 $self->{layout}->set_markup ($markup); 1623 $self->{layout}->set_markup ($markup);
1492 1624
1625 delete $self->{size_req};
1493 $self->realloc; 1626 $self->realloc;
1494 $self->update; 1627 $self->update;
1495} 1628}
1496 1629
1497sub size_request { 1630sub size_request {
1498 my ($self) = @_; 1631 my ($self) = @_;
1499 1632
1633 $self->{size_req} ||= do {
1500 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1634 $self->{layout}->set_font ($self->{font}) if $self->{font};
1501 $self->{layout}->set_width ($self->{max_w} || -1); 1635 $self->{layout}->set_width ($self->{max_w} || -1);
1502 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1503 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1639
1506 my ($w, $h) = $self->{layout}->size; 1640 my ($w, $h) = $self->{layout}->size;
1507 1641
1508 if (exists $self->{template}) { 1642 if (exists $self->{template}) {
1509 $self->{template}->set_font ($self->{font}) if $self->{font}; 1643 $self->{template}->set_font ($self->{font}) if $self->{font};
1644 $self->{template}->set_width ($self->{max_w} || -1);
1510 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1645 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1646
1512 my ($w2, $h2) = $self->{template}->size; 1647 my ($w2, $h2) = $self->{template}->size;
1513 1648
1514 $w = List::Util::max $w, $w2; 1649 $w = List::Util::max $w, $w2;
1515 $h = List::Util::max $h, $h2; 1650 $h = List::Util::max $h, $h2;
1651 }
1652
1653 [$w, $h]
1516 } 1654 };
1517 1655
1518 ($w, $h) 1656 @{ $self->{size_req} }
1519} 1657}
1520 1658
1659sub baseline_shift {
1660 $_[0]{layout}->descent
1661}
1662
1521sub size_allocate { 1663sub invoke_size_allocate {
1522 my ($self, $w, $h, $changed) = @_; 1664 my ($self, $w, $h) = @_;
1665
1666 delete $self->{ox};
1523 1667
1524 delete $self->{texture} 1668 delete $self->{texture}
1525 if $changed; 1669 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1670
1671 1
1526} 1672}
1527 1673
1528sub set_fontsize { 1674sub set_fontsize {
1529 my ($self, $fontsize) = @_; 1675 my ($self, $fontsize) = @_;
1530 1676
1531 $self->{fontsize} = $fontsize; 1677 $self->{fontsize} = $fontsize;
1678 delete $self->{size_req};
1532 delete $self->{texture}; 1679 delete $self->{texture};
1533 1680
1534 $self->realloc; 1681 $self->realloc;
1535} 1682}
1536 1683
1684sub reconfigure {
1685 my ($self) = @_;
1686
1687 delete $self->{size_req};
1688 delete $self->{texture};
1689
1690 $self->SUPER::reconfigure;
1691}
1692
1537sub _draw { 1693sub _draw {
1538 my ($self) = @_; 1694 my ($self) = @_;
1539 1695
1540 $self->SUPER::_draw; # draw background, if applicable 1696 $self->SUPER::_draw; # draw background, if applicable
1541 1697
1542 my $tex = $self->{texture} ||= do { 1698 my $size = $self->{texture} ||= do {
1543 $self->{layout}->set_foreground (@{$self->{fg}}); 1699 $self->{layout}->set_foreground (@{$self->{fg}});
1544 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1700 $self->{layout}->set_font ($self->{font}) if $self->{font};
1545 $self->{layout}->set_width ($self->{w}); 1701 $self->{layout}->set_width ($self->{w});
1546 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1702 $self->{layout}->set_ellipsise ($self->{ellipsise});
1547 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1703 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1548 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1704 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1549 1705
1550 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1706 [$self->{layout}->size]
1707 };
1551 1708
1709 unless (exists $self->{ox}) {
1552 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1710 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1553 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1711 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1554 : ($self->{w} - $tex->{w}) * 0.5); 1712 : ($self->{w} - $size->[0]) * 0.5);
1555 1713
1556 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1714 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1557 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1715 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1558 : ($self->{h} - $tex->{h}) * 0.5); 1716 : ($self->{h} - $size->[1]) * 0.5);
1559
1560 $tex
1561 }; 1717 };
1562 1718
1563 glEnable GL_TEXTURE_2D; 1719 my $w = List::Util::min $self->{w} + 4, $size->[0];
1564 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1720 my $h = List::Util::min $self->{h} + 2, $size->[1];
1565 1721
1566 if ($tex->{format} == GL_ALPHA) { 1722 $self->{layout}->render ($self->{ox}, $self->{oy});
1567 glColor @{$self->{fg}};
1568 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1569 } else {
1570 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1571 }
1572
1573 glDisable GL_TEXTURE_2D;
1574} 1723}
1575 1724
1576############################################################################# 1725#############################################################################
1577 1726
1578package CFClient::UI::EntryBase; 1727package CFClient::UI::EntryBase;
… …
1592 can_hover => 1, 1741 can_hover => 1,
1593 can_focus => 1, 1742 can_focus => 1,
1594 valign => 0, 1743 valign => 0,
1595 can_events => 1, 1744 can_events => 1,
1596 #text => ... 1745 #text => ...
1746 #hidden => "*",
1597 @_ 1747 @_
1598 ) 1748 )
1599} 1749}
1600 1750
1601sub _set_text { 1751sub _set_text {
… …
1603 1753
1604 delete $self->{cur_h}; 1754 delete $self->{cur_h};
1605 1755
1606 return if $self->{text} eq $text; 1756 return if $self->{text} eq $text;
1607 1757
1608 delete $self->{texture};
1609
1610 $self->{last_activity} = $::NOW; 1758 $self->{last_activity} = $::NOW;
1611 $self->{text} = $text; 1759 $self->{text} = $text;
1612 1760
1613 $text =~ s/./*/g if $self->{hidden}; 1761 $text =~ s/./*/g if $self->{hidden};
1614 $self->{layout}->set_text ("$text "); 1762 $self->{layout}->set_text ("$text ");
1763 delete $self->{size_req};
1615 1764
1616 $self->_emit (changed => $self->{text}); 1765 $self->emit (changed => $self->{text});
1766
1767 $self->realloc;
1768 $self->update;
1617} 1769}
1618 1770
1619sub set_text { 1771sub set_text {
1620 my ($self, $text) = @_; 1772 my ($self, $text) = @_;
1621 1773
1622 $self->{cursor} = length $text; 1774 $self->{cursor} = length $text;
1623 $self->_set_text ($text); 1775 $self->_set_text ($text);
1624
1625 $self->realloc;
1626} 1776}
1627 1777
1628sub get_text { 1778sub get_text {
1629 $_[0]{text} 1779 $_[0]{text}
1630} 1780}
… …
1635 my ($w, $h) = $self->SUPER::size_request; 1785 my ($w, $h) = $self->SUPER::size_request;
1636 1786
1637 ($w + 1, $h) # add 1 for cursor 1787 ($w + 1, $h) # add 1 for cursor
1638} 1788}
1639 1789
1640sub key_down { 1790sub invoke_key_down {
1641 my ($self, $ev) = @_; 1791 my ($self, $ev) = @_;
1642 1792
1643 my $mod = $ev->{mod}; 1793 my $mod = $ev->{mod};
1644 my $sym = $ev->{sym}; 1794 my $sym = $ev->{sym};
1645 my $uni = $ev->{unicode}; 1795 my $uni = $ev->{unicode};
… …
1657 } elsif ($sym == CFClient::SDLK_HOME) { 1807 } elsif ($sym == CFClient::SDLK_HOME) {
1658 $self->{cursor} = 0; 1808 $self->{cursor} = 0;
1659 } elsif ($sym == CFClient::SDLK_END) { 1809 } elsif ($sym == CFClient::SDLK_END) {
1660 $self->{cursor} = length $text; 1810 $self->{cursor} = length $text;
1661 } elsif ($uni == 27) { 1811 } elsif ($uni == 27) {
1662 $self->_emit ('escape'); 1812 $self->emit ('escape');
1663 } elsif ($uni) { 1813 } elsif ($uni) {
1664 substr $text, $self->{cursor}++, 0, chr $uni; 1814 substr $text, $self->{cursor}++, 0, chr $uni;
1815 } else {
1816 return 0;
1665 } 1817 }
1666 1818
1667 $self->_set_text ($text); 1819 $self->_set_text ($text);
1668 1820
1669 $self->realloc; 1821 $self->realloc;
1670}
1671 1822
1823 1
1824}
1825
1672sub focus_in { 1826sub invoke_focus_in {
1673 my ($self) = @_; 1827 my ($self) = @_;
1674 1828
1675 $self->{last_activity} = $::NOW; 1829 $self->{last_activity} = $::NOW;
1676 1830
1677 $self->SUPER::focus_in; 1831 $self->SUPER::invoke_focus_in
1678} 1832}
1679 1833
1680sub button_down { 1834sub invoke_button_down {
1681 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1682 1836
1683 $self->SUPER::button_down ($ev, $x, $y); 1837 $self->SUPER::invoke_button_down ($ev, $x, $y);
1684 1838
1685 my $idx = $self->{layout}->xy_to_index ($x, $y); 1839 my $idx = $self->{layout}->xy_to_index ($x, $y);
1686 1840
1687 # byte-index to char-index 1841 # byte-index to char-index
1688 my $text = $self->{text}; 1842 my $text = $self->{text};
1689 utf8::encode $text; 1843 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1690 $self->{cursor} = length substr $text, 0, $idx; 1844 $self->{cursor} = length $text;
1691 1845
1692 $self->_set_text ($self->{text}); 1846 $self->_set_text ($self->{text});
1693 $self->update; 1847 $self->update;
1848
1849 1
1694} 1850}
1695 1851
1696sub mouse_motion { 1852sub invoke_mouse_motion {
1697 my ($self, $ev, $x, $y) = @_; 1853 my ($self, $ev, $x, $y) = @_;
1698# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1854# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1855
1856 1
1699} 1857}
1700 1858
1701sub _draw { 1859sub _draw {
1702 my ($self) = @_; 1860 my ($self) = @_;
1703 1861
1704 local $self->{fg} = $self->{fg}; 1862 local $self->{fg} = $self->{fg};
1705 1863
1706 if ($FOCUS == $self) { 1864 if ($FOCUS == $self) {
1707 glColor @{$self->{active_bg}}; 1865 glColor_premultiply @{$self->{active_bg}};
1708 $self->{fg} = $self->{active_fg}; 1866 $self->{fg} = $self->{active_fg};
1709 } else { 1867 } else {
1710 glColor @{$self->{bg}}; 1868 glColor_premultiply @{$self->{bg}};
1711 } 1869 }
1712 1870
1713 glEnable GL_BLEND; 1871 glEnable GL_BLEND;
1714 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1872 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1715 glBegin GL_QUADS; 1873 glBegin GL_QUADS;
1716 glVertex 0 , 0; 1874 glVertex 0 , 0;
1717 glVertex 0 , $self->{h}; 1875 glVertex 0 , $self->{h};
1718 glVertex $self->{w}, $self->{h}; 1876 glVertex $self->{w}, $self->{h};
1719 glVertex $self->{w}, 0; 1877 glVertex $self->{w}, 0;
… …
1744 1902
1745our @ISA = CFClient::UI::EntryBase::; 1903our @ISA = CFClient::UI::EntryBase::;
1746 1904
1747use CFClient::OpenGL; 1905use CFClient::OpenGL;
1748 1906
1749sub key_down { 1907sub invoke_key_down {
1750 my ($self, $ev) = @_; 1908 my ($self, $ev) = @_;
1751 1909
1752 my $sym = $ev->{sym}; 1910 my $sym = $ev->{sym};
1753 1911
1754 if ($sym == 13) { 1912 if ($sym == 13) {
1755 unshift @{$self->{history}}, 1913 unshift @{$self->{history}},
1756 my $txt = $self->get_text; 1914 my $txt = $self->get_text;
1915
1757 $self->{history_pointer} = -1; 1916 $self->{history_pointer} = -1;
1758 $self->{history_saveback} = ''; 1917 $self->{history_saveback} = '';
1759 $self->_emit (activate => $txt); 1918 $self->emit (activate => $txt);
1760 $self->update; 1919 $self->update;
1761 1920
1762 } elsif ($sym == CFClient::SDLK_UP) { 1921 } elsif ($sym == CFClient::SDLK_UP) {
1763 if ($self->{history_pointer} < 0) { 1922 if ($self->{history_pointer} < 0) {
1764 $self->{history_saveback} = $self->get_text; 1923 $self->{history_saveback} = $self->get_text;
… …
1780 } else { 1939 } else {
1781 $self->set_text ($self->{history_saveback}); 1940 $self->set_text ($self->{history_saveback});
1782 } 1941 }
1783 1942
1784 } else { 1943 } else {
1785 $self->SUPER::key_down ($ev); 1944 return $self->SUPER::invoke_key_down ($ev)
1945 }
1946
1786 } 1947 1
1787
1788} 1948}
1789 1949
1790############################################################################# 1950#############################################################################
1791 1951
1792package CFClient::UI::Button; 1952package CFClient::UI::Button;
… …
1813 can_events => 1, 1973 can_events => 1,
1814 @_ 1974 @_
1815 ) 1975 )
1816} 1976}
1817 1977
1818sub activate { }
1819
1820sub button_up { 1978sub invoke_button_up {
1821 my ($self, $ev, $x, $y) = @_; 1979 my ($self, $ev, $x, $y) = @_;
1822 1980
1823 $self->emit ("activate") 1981 $self->emit ("activate")
1824 if $x >= 0 && $x < $self->{w} 1982 if $x >= 0 && $x < $self->{w}
1825 && $y >= 0 && $y < $self->{h}; 1983 && $y >= 0 && $y < $self->{h};
1984
1985 1
1826} 1986}
1827 1987
1828sub _draw { 1988sub _draw {
1829 my ($self) = @_; 1989 my ($self) = @_;
1830 1990
1831 local $self->{fg} = $self->{fg}; 1991 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1832
1833 if ($GRAB == $self) {
1834 $self->{fg} = $self->{active_fg};
1835 }
1836 1992
1837 glEnable GL_TEXTURE_2D; 1993 glEnable GL_TEXTURE_2D;
1838 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1994 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1839 glColor 0, 0, 0, 1; 1995 glColor 0, 0, 0, 1;
1840 1996
1841 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 1997 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1842 1998
1843 glDisable GL_TEXTURE_2D; 1999 glDisable GL_TEXTURE_2D;
1844 2000
1845 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
2002}
2003
2004#############################################################################
2005
2006package CFClient::UI::ImageButton;
2007
2008our @ISA = CFClient::UI::Image::;
2009
2010use CFClient::OpenGL;
2011
2012my %textures;
2013
2014sub new {
2015 my $class = shift;
2016
2017 my $self = $class->SUPER::new (
2018 padding_x => 4,
2019 padding_y => 4,
2020 fg => [1, 1, 1],
2021 active_fg => [0, 0, 1],
2022 can_hover => 1,
2023 align => 0,
2024 valign => 0,
2025 can_events => 1,
2026 @_
2027 );
2028}
2029
2030sub invoke_button_up {
2031 my ($self, $ev, $x, $y) = @_;
2032
2033 $self->emit ("activate")
2034 if $x >= 0 && $x < $self->{w}
2035 && $y >= 0 && $y < $self->{h};
2036
2037 1
1846} 2038}
1847 2039
1848############################################################################# 2040#############################################################################
1849 2041
1850package CFClient::UI::CheckBox; 2042package CFClient::UI::CheckBox;
… …
1877 my ($self) = @_; 2069 my ($self) = @_;
1878 2070
1879 (6) x 2 2071 (6) x 2
1880} 2072}
1881 2073
2074sub toggle {
2075 my ($self) = @_;
2076
2077 $self->{state} = !$self->{state};
2078 $self->emit (changed => $self->{state});
2079 $self->update;
2080}
2081
1882sub button_down { 2082sub invoke_button_down {
1883 my ($self, $ev, $x, $y) = @_; 2083 my ($self, $ev, $x, $y) = @_;
1884 2084
1885 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2085 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1886 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2086 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1887 $self->{state} = !$self->{state}; 2087 $self->toggle;
1888 $self->_emit (changed => $self->{state}); 2088 } else {
2089 return 0
2090 }
2091
1889 } 2092 1
1890} 2093}
1891 2094
1892sub _draw { 2095sub _draw {
1893 my ($self) = @_; 2096 my ($self) = @_;
1894 2097
… …
1914package CFClient::UI::Image; 2117package CFClient::UI::Image;
1915 2118
1916our @ISA = CFClient::UI::Base::; 2119our @ISA = CFClient::UI::Base::;
1917 2120
1918use CFClient::OpenGL; 2121use CFClient::OpenGL;
1919use Carp qw/confess/;
1920 2122
1921our %loaded_images; 2123our %texture_cache;
1922 2124
1923sub new { 2125sub new {
1924 my $class = shift; 2126 my $class = shift;
1925 2127
1926 my $self = $class->SUPER::new (can_events => 0, @_); 2128 my $self = $class->SUPER::new (
2129 can_events => 0,
2130 @_,
2131 );
1927 2132
1928 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2133 $self->{path} || $self->{tex}
2134 or Carp::croak "'path' or 'tex' attributes required";
1929 2135
1930 $loaded_images{$self->{image}} ||= 2136 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1931 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2137 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1932 2138
1933 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2139 Scalar::Util::weaken $texture_cache{$self->{path}};
1934 2140
1935 Scalar::Util::weaken $loaded_images{$self->{image}}; 2141 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1936
1937 $self->{aspect} = $tex->{w} / $tex->{h};
1938 2142
1939 $self 2143 $self
1940} 2144}
1941 2145
1942sub size_request { 2146sub size_request {
1943 my ($self) = @_; 2147 my ($self) = @_;
1944 2148
1945 ($self->{tex}->{w}, $self->{tex}->{h}) 2149 ($self->{tex}{w}, $self->{tex}{h})
1946} 2150}
1947 2151
1948sub _draw { 2152sub _draw {
1949 my ($self) = @_; 2153 my ($self) = @_;
1950 2154
… …
2059 my $ycut1 = max 0, min 1, $ycut; 2263 my $ycut1 = max 0, min 1, $ycut;
2060 my $ycut2 = max 0, min 1, $ycut - 1; 2264 my $ycut2 = max 0, min 1, $ycut - 1;
2061 2265
2062 my $h1 = $self->{h} * (1 - $ycut1); 2266 my $h1 = $self->{h} * (1 - $ycut1);
2063 my $h2 = $self->{h} * (1 - $ycut2); 2267 my $h2 = $self->{h} * (1 - $ycut2);
2268 my $h3 = $self->{h};
2269
2270 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2064 2271
2065 glEnable GL_BLEND; 2272 glEnable GL_BLEND;
2066 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2273 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2274 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2067 glEnable GL_TEXTURE_2D; 2275 glEnable GL_TEXTURE_2D;
2068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2276 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2069 2277
2070 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2278 glBindTexture GL_TEXTURE_2D, $t1->{name};
2071 glBegin GL_QUADS; 2279 glBegin GL_QUADS;
… …
2086 2294
2087 if ($t3) { 2295 if ($t3) {
2088 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2296 glBindTexture GL_TEXTURE_2D, $t3->{name};
2089 glBegin GL_QUADS; 2297 glBegin GL_QUADS;
2090 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2298 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2091 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2299 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2092 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2300 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2093 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2301 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2094 glEnd; 2302 glEnd;
2095 } 2303 }
2096 2304
2097 glDisable GL_BLEND; 2305 glDisable GL_BLEND;
… …
2185 $self->update; 2393 $self->update;
2186 2394
2187 $self 2395 $self
2188} 2396}
2189 2397
2190sub changed { }
2191
2192sub set_range { 2398sub set_range {
2193 my ($self, $range) = @_; 2399 my ($self, $range) = @_;
2194 2400
2195 ($range, $self->{range}) = ($self->{range}, $range); 2401 ($range, $self->{range}) = ($self->{range}, $range);
2196 2402
2197 $self->update
2198 if "@$range" ne "@{$self->{range}}"; 2403 if ("@$range" ne "@{$self->{range}}") {
2404 $self->update;
2405 $self->set_value ($self->{range}[0]);
2406 }
2199} 2407}
2200 2408
2201sub set_value { 2409sub set_value {
2202 my ($self, $value) = @_; 2410 my ($self, $value) = @_;
2203 2411
… …
2214 if $unit; 2422 if $unit;
2215 2423
2216 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2424 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2217 2425
2218 if ($value != $old_value) { 2426 if ($value != $old_value) {
2219 $self->_emit (changed => $value); 2427 $self->emit (changed => $value);
2220 $self->update; 2428 $self->update;
2221 } 2429 }
2222} 2430}
2223 2431
2224sub size_request { 2432sub size_request {
2225 my ($self) = @_; 2433 my ($self) = @_;
2226 2434
2227 ($self->{req_w}, $self->{req_h}) 2435 ($self->{req_w}, $self->{req_h})
2228} 2436}
2229 2437
2230sub button_down { 2438sub invoke_button_down {
2231 my ($self, $ev, $x, $y) = @_; 2439 my ($self, $ev, $x, $y) = @_;
2232 2440
2233 $self->SUPER::button_down ($ev, $x, $y); 2441 $self->SUPER::invoke_button_down ($ev, $x, $y);
2234 2442
2235 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2443 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2236 2444
2237 $self->mouse_motion ($ev, $x, $y); 2445 $self->invoke_mouse_motion ($ev, $x, $y)
2238} 2446}
2239 2447
2240sub mouse_motion { 2448sub invoke_mouse_motion {
2241 my ($self, $ev, $x, $y) = @_; 2449 my ($self, $ev, $x, $y) = @_;
2242 2450
2243 if ($GRAB == $self) { 2451 if ($GRAB == $self) {
2244 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2452 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2245 2453
2246 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2454 my (undef, $lo, $hi, $page) = @{$self->{range}};
2247 2455
2248 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2456 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2249 2457
2250 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2458 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2459 } else {
2460 return 0;
2461 }
2462
2251 } 2463 1
2252} 2464}
2253 2465
2254sub update { 2466sub update {
2255 my ($self) = @_; 2467 my ($self) = @_;
2256 2468
2257 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2469 delete $self->{knob_w};
2470 $self->SUPER::update;
2471}
2472
2473sub _draw {
2474 my ($self) = @_;
2475
2476 unless ($self->{knob_w}) {
2258 $self->set_value ($self->{range}[0]); 2477 $self->set_value ($self->{range}[0]);
2259 2478
2260 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2479 my ($value, $lo, $hi, $page) = @{$self->{range}};
2261 my $range = ($hi - $page - $lo) || 1e-100; 2480 my $range = ($hi - $page - $lo) || 1e-100;
2262 2481
… …
2268 $value = ($value - $lo) / $range; 2487 $value = ($value - $lo) / $range;
2269 $value = $value * $self->{scale} + $self->{offset}; 2488 $value = $value * $self->{scale} + $self->{offset};
2270 2489
2271 $self->{knob_x} = $value - $knob_w * 0.5; 2490 $self->{knob_x} = $value - $knob_w * 0.5;
2272 $self->{knob_w} = $knob_w; 2491 $self->{knob_w} = $knob_w;
2273 }); 2492 }
2274
2275 $self->SUPER::update;
2276}
2277
2278sub _draw {
2279 my ($self) = @_;
2280 2493
2281 $self->SUPER::_draw (); 2494 $self->SUPER::_draw ();
2282 2495
2283 glScale $self->{w}, $self->{h}; 2496 glScale $self->{w}, $self->{h};
2284 2497
… …
2345sub set_range { shift->{slider}->set_range (@_) } 2558sub set_range { shift->{slider}->set_range (@_) }
2346sub set_value { shift->{slider}->set_value (@_) } 2559sub set_value { shift->{slider}->set_value (@_) }
2347 2560
2348############################################################################# 2561#############################################################################
2349 2562
2350package CFClient::UI::TextView; 2563package CFClient::UI::TextScroller;
2351 2564
2352our @ISA = CFClient::UI::HBox::; 2565our @ISA = CFClient::UI::HBox::;
2353 2566
2354use CFClient::OpenGL; 2567use CFClient::OpenGL;
2355 2568
… …
2357 my $class = shift; 2570 my $class = shift;
2358 2571
2359 my $self = $class->SUPER::new ( 2572 my $self = $class->SUPER::new (
2360 fontsize => 1, 2573 fontsize => 1,
2361 can_events => 0, 2574 can_events => 0,
2575 indent => 0,
2362 #font => default_font 2576 #font => default_font
2363 @_, 2577 @_,
2364 2578
2365 layout => (new CFClient::Layout 1), 2579 layout => (new CFClient::Layout),
2366 par => [], 2580 par => [],
2367 height => 0, 2581 height => 0,
2368 children => [ 2582 children => [
2369 (new CFClient::UI::Empty expand => 1), 2583 (new CFClient::UI::Empty expand => 1),
2370 (new CFClient::UI::Slider vertical => 1), 2584 (new CFClient::UI::Slider vertical => 1),
… …
2381 2595
2382 $self->{fontsize} = $fontsize; 2596 $self->{fontsize} = $fontsize;
2383 $self->reflow; 2597 $self->reflow;
2384} 2598}
2385 2599
2600sub size_request {
2601 my ($self) = @_;
2602
2603 my ($empty, $slider) = @{ $self->{children} };
2604
2605 local $self->{children} = [$empty, $slider];
2606 $self->SUPER::size_request
2607}
2608
2386sub size_allocate { 2609sub invoke_size_allocate {
2387 my ($self, $w, $h, $changed) = @_; 2610 my ($self, $w, $h) = @_;
2388 2611
2389 $self->SUPER::size_allocate ($w, $h, $changed); 2612 my ($empty, $slider, @other) = @{ $self->{children} };
2390 2613 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2391 return unless $changed;
2392 2614
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2615 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2617 $self->{layout}->set_width ($empty->{w});
2618 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2619
2397 $self->reflow; 2620 $self->reflow;
2398}
2399 2621
2400sub text_size { 2622 local $self->{children} = [$empty, $slider];
2401 my ($self, $text, $indent) = @_; 2623 $self->SUPER::invoke_size_allocate ($w, $h)
2624}
2625
2626sub get_layout {
2627 my ($self, $para) = @_;
2402 2628
2403 my $layout = $self->{layout}; 2629 my $layout = $self->{layout};
2404 2630
2631 $layout->set_font ($self->{font}) if $self->{font};
2632 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2633 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2634 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2635 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2636 $layout->set_markup ($para->{markup});
2637
2638 $layout->set_shapes (
2639 map
2640 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2641 @{$para->{widget}}
2408 2642 );
2643
2409 $layout->size 2644 $layout
2410} 2645}
2411 2646
2412sub reflow { 2647sub reflow {
2413 my ($self) = @_; 2648 my ($self) = @_;
2414 2649
… …
2423 $self->{children}[1]->set_value ($offset); 2658 $self->{children}[1]->set_value ($offset);
2424} 2659}
2425 2660
2426sub clear { 2661sub clear {
2427 my ($self) = @_; 2662 my ($self) = @_;
2663
2664 my (undef, undef, @other) = @{ $self->{children} };
2665 $self->remove ($_) for @other;
2428 2666
2429 $self->{par} = []; 2667 $self->{par} = [];
2430 $self->{height} = 0; 2668 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2669 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2670}
2433 2671
2434sub add_paragraph { 2672sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2673 my ($self, $color, $para, $indent) = @_;
2436 2674
2437 for my $line (split /\n/, $text) { 2675 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2676
2439 $self->{height} += $h; 2677 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2678 w => 1e10,
2679 wrapped => 1,
2680 fg => $color,
2681 indent => $indent,
2682 markup => $text,
2683 widget => \@w,
2441 } 2684 };
2442 2685
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2686 $self->add (@w) if @w;
2687 push @{$self->{par}}, $para;
2688
2689 $self->{need_reflow}++;
2690 $self->update;
2691}
2692
2693sub scroll_to_bottom {
2694 my ($self) = @_;
2695
2696 $self->{scroll_to_bottom} = 1;
2697 $self->update;
2444} 2698}
2445 2699
2446sub update { 2700sub update {
2447 my ($self) = @_; 2701 my ($self) = @_;
2448 2702
… …
2450 2704
2451 return unless $self->{h} > 0; 2705 return unless $self->{h} > 0;
2452 2706
2453 delete $self->{texture}; 2707 delete $self->{texture};
2454 2708
2455 $ROOT->on_post_alloc ($self, sub { 2709 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2710 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2711
2458 if (delete $self->{need_reflow}) { 2712 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2713 my $height = 0;
2460 2714
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2715 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2716 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2717 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2718 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2719
2471 $_->[1] = $h; 2720 $para->{w} = $w + $para->{indent};
2721 $para->{h} = $h;
2722 $para->{wrapped} = $layout->has_wrapped;
2472 } 2723 }
2473 2724
2474 $height += $_->[1]; 2725 $height += $para->{h};
2475 } 2726 }
2476 2727
2477 $self->{height} = $height; 2728 $self->{height} = $height;
2478 2729
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2730 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2731
2481 delete $self->{texture}; 2732 delete $self->{texture};
2482 } 2733 }
2483 2734
2735 if (delete $self->{scroll_to_bottom}) {
2736 $self->{children}[1]->set_value (1e10);
2737 }
2738
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2739 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2740 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2741 glClear GL_COLOR_BUFFER_BIT;
2487 2742
2488 my $top = int $self->{children}[1]{range}[0]; 2743 my $top = int $self->{children}[1]{range}[0];
2489 2744
2490 my $y0 = $top; 2745 my $y0 = $top;
2491 my $y1 = $top + $H; 2746 my $y1 = $top + $H;
2492 2747
2493 my $y = 0; 2748 my $y = 0;
2494 2749
2495 my $layout = $self->{layout};
2496
2497 $layout->set_font ($self->{font}) if $self->{font};
2498
2499 glEnable GL_BLEND;
2500 #TODO# not correct in windows where rgba is forced off
2501 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2502
2503 for my $par (@{$self->{par}}) { 2750 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2751 my $h = $para->{h};
2505 2752
2506 if ($y0 < $y + $h && $y < $y1) { 2753 if ($y0 < $y + $h && $y < $y1) {
2507 $layout->set_foreground (@{ $par->[2] });
2508 $layout->set_width ($W - $par->[3]);
2509 $layout->set_markup ($par->[4]);
2510 2754
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2755 my $layout = $self->get_layout ($para);
2512 2756
2513 glRasterPos $par->[3], $y - $y0; 2757 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2758
2759 if (my @w = @{ $para->{widget} }) {
2760 my @s = $layout->get_shapes;
2761
2762 for (@w) {
2763 my ($dx, $dy) = splice @s, 0, 2, ();
2764
2765 $_->{x} = $dx + $para->{indent};
2766 $_->{y} = $dy + $y - $y0;
2767
2768 $_->draw;
2769 }
2770 }
2515 } 2771 }
2516 2772
2517 $y += $h; 2773 $y += $h;
2518 } 2774 }
2519
2520 glDisable GL_BLEND;
2521 }; 2775 };
2522 }); 2776 });
2523} 2777}
2524 2778
2779sub reconfigure {
2780 my ($self) = @_;
2781
2782 $self->SUPER::reconfigure;
2783
2784 $_->{w} = 1e10 for @{ $self->{par} };
2785 $self->reflow;
2786}
2787
2525sub _draw { 2788sub _draw {
2526 my ($self) = @_; 2789 my ($self) = @_;
2527 2790
2528 glEnable GL_TEXTURE_2D; 2791 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2792 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2793 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2794 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2795 glDisable GL_TEXTURE_2D;
2533 2796
2534 $self->{children}[1]->draw; 2797 $self->{children}[1]->draw;
2535
2536} 2798}
2537 2799
2538############################################################################# 2800#############################################################################
2539 2801
2540package CFClient::UI::Animator; 2802package CFClient::UI::Animator;
… …
2619} 2881}
2620 2882
2621sub set_tooltip_from { 2883sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2884 my ($self, $widget) = @_;
2623 2885
2886 my $tooltip = $widget->{tooltip};
2887
2888 if ($ENV{CFPLUS_DEBUG} & 2) {
2889 $tooltip .= "\n\n" . (ref $widget) . "\n"
2890 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2891 . "req $widget->{req_w} $widget->{req_h}\n"
2892 . "visible $widget->{visible}";
2893 }
2894
2895 $tooltip =~ s/^\n+//;
2896 $tooltip =~ s/\n+$//;
2897
2624 $self->add (new CFClient::UI::Label 2898 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2899 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2900 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2901 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2902 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2903 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2904 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2637 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2911 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2638 2912
2639 ($w + 4, $h + 4) 2913 ($w + 4, $h + 4)
2640} 2914}
2641 2915
2642sub size_allocate { 2916sub invoke_size_allocate {
2643 my ($self, $w, $h, $changed) = @_; 2917 my ($self, $w, $h) = @_;
2644 2918
2645 return unless $changed;
2646
2647 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2919 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2648} 2920}
2649 2921
2650sub visibility_change { 2922sub invoke_visibility_change {
2651 my ($self, $visible) = @_; 2923 my ($self, $visible) = @_;
2652 2924
2653 return unless $visible; 2925 return unless $visible;
2654 2926
2655 $self->{root}->on_post_alloc ("move_$self" => sub { 2927 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2657 or return; 2929 or return;
2658 2930
2659 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2931 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2660 2932
2661 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2933 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2662 if $x + $self->{w} > $::WIDTH; 2934 if $x + $self->{w} > $self->{root}{w};
2663 2935
2664 $self->move_abs ($x, $y); 2936 $self->move_abs ($x, $y);
2665 }); 2937 });
2666} 2938}
2667 2939
… …
2756 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3028 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2757 3029
2758 if ($tex) { 3030 if ($tex) {
2759 glEnable GL_TEXTURE_2D; 3031 glEnable GL_TEXTURE_2D;
2760 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3032 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2761 glColor 1, 1, 1, 1; 3033 glColor 0, 0, 0, 1;
2762 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3034 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2763 glDisable GL_TEXTURE_2D; 3035 glDisable GL_TEXTURE_2D;
2764 } 3036 }
2765} 3037}
2766 3038
2767sub DESTROY { 3039sub destroy {
2768 my ($self) = @_; 3040 my ($self) = @_;
2769 3041
2770 $self->{timer}->cancel 3042 $self->{timer}->cancel
2771 if $self->{timer}; 3043 if $self->{timer};
2772 3044
2773 $self->SUPER::DESTROY; 3045 $self->SUPER::destroy;
2774} 3046}
2775 3047
2776############################################################################# 3048#############################################################################
2777 3049
2778package CFClient::UI::Inventory; 3050package CFClient::UI::Buttonbar;
2779 3051
2780our @ISA = CFClient::UI::ScrolledWindow::; 3052our @ISA = CFClient::UI::HBox::;
2781 3053
2782sub new { 3054# TODO: should actualyl wrap buttons and other goodies.
2783 my $class = shift;
2784
2785 my $self = $class->SUPER::new (
2786 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2787 @_,
2788 );
2789
2790 $self
2791}
2792
2793sub set_items {
2794 my ($self, $items) = @_;
2795
2796 $self->{scrolled}->clear;
2797 return unless $items;
2798
2799 my @items = sort {
2800 ($a->{type} <=> $b->{type})
2801 or ($a->{name} cmp $b->{name})
2802 } @$items;
2803
2804 $self->{real_items} = \@items;
2805
2806 my $row = 0;
2807 for my $item (@items) {
2808 CFClient::Item::update_widgets $item;
2809
2810 $self->{scrolled}->add (0, $row, $item->{face_widget});
2811 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2812 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2813
2814 $row++;
2815 }
2816}
2817 3055
2818############################################################################# 3056#############################################################################
2819 3057
2820package CFClient::UI::Menu; 3058package CFClient::UI::Menu;
2821 3059
… …
2833 ); 3071 );
2834 3072
2835 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3073 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2836 3074
2837 for my $item (@{ $self->{items} }) { 3075 for my $item (@{ $self->{items} }) {
2838 my ($widget, $cb) = @$item; 3076 my ($widget, $cb, $tooltip) = @$item;
2839 3077
2840 # handle various types of items, only text for now 3078 # handle various types of items, only text for now
2841 if (!ref $widget) { 3079 if (!ref $widget) {
3080 if ($widget =~ /\t/) {
3081 my ($left, $right) = split /\t/, $widget, 2;
3082
3083 $widget = new CFClient::UI::HBox
3084 can_hover => 1,
3085 can_events => 1,
3086 tooltip => $tooltip,
3087 children => [
3088 (new CFClient::UI::Label markup => $left, expand => 1),
3089 (new CFClient::UI::Label markup => $right, align => +1),
3090 ],
3091 ;
3092
3093 } else {
2842 $widget = new CFClient::UI::Label 3094 $widget = new CFClient::UI::Label
2843 can_hover => 1, 3095 can_hover => 1,
2844 can_events => 1, 3096 can_events => 1,
2845 text => $widget; 3097 markup => $widget,
3098 tooltip => $tooltip;
3099 }
2846 } 3100 }
2847 3101
2848 $self->{item}{$widget} = $item; 3102 $self->{item}{$widget} = $item;
2849 3103
2850 $self->{vbox}->add ($widget); 3104 $self->{vbox}->add ($widget);
… …
2855 3109
2856# popup given the event (must be a mouse button down event currently) 3110# popup given the event (must be a mouse button down event currently)
2857sub popup { 3111sub popup {
2858 my ($self, $ev) = @_; 3112 my ($self, $ev) = @_;
2859 3113
2860 $self->_emit ("popdown"); 3114 $self->emit ("popdown");
2861 3115
2862 # maybe save $GRAB? must be careful about events... 3116 # maybe save $GRAB? must be careful about events...
2863 $GRAB = $self; 3117 $GRAB = $self;
2864 $self->{button} = $ev->{button}; 3118 $self->{button} = $ev->{button};
2865 3119
2866 $self->show; 3120 $self->show;
2867 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3121 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2868} 3122}
2869 3123
2870sub mouse_motion { 3124sub invoke_mouse_motion {
2871 my ($self, $ev, $x, $y) = @_; 3125 my ($self, $ev, $x, $y) = @_;
2872 3126
2873 # TODO: should use vbox->find_widget or so 3127 # TODO: should use vbox->find_widget or so
2874 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3128 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2875 $self->{hover} = $self->{item}{$HOVER}; 3129 $self->{hover} = $self->{item}{$HOVER};
2876}
2877 3130
3131 0
3132}
3133
2878sub button_up { 3134sub invoke_button_up {
2879 my ($self, $ev, $x, $y) = @_; 3135 my ($self, $ev, $x, $y) = @_;
2880 3136
2881 if ($ev->{button} == $self->{button}) { 3137 if ($ev->{button} == $self->{button}) {
2882 undef $GRAB; 3138 undef $GRAB;
2883 $self->hide; 3139 $self->hide;
2884 3140
2885 $self->_emit ("popdown"); 3141 $self->emit ("popdown");
2886 $self->{hover}[1]->() if $self->{hover}; 3142 $self->{hover}[1]->() if $self->{hover};
3143 } else {
3144 return 0
3145 }
3146
2887 } 3147 1
2888} 3148}
2889 3149
2890############################################################################# 3150#############################################################################
2891 3151
2892package CFClient::UI::Statusbox; 3152package CFClient::UI::Multiplexer;
2893 3153
2894our @ISA = CFClient::UI::VBox::; 3154our @ISA = CFClient::UI::Container::;
2895 3155
2896sub new { 3156sub new {
2897 my $class = shift; 3157 my $class = shift;
2898 3158
2899 $class->SUPER::new ( 3159 my $self = $class->SUPER::new (
3160 @_,
3161 );
3162
3163 $self->{current} = $self->{children}[0]
3164 if @{ $self->{children} };
3165
3166 $self
3167}
3168
3169sub add {
3170 my ($self, @widgets) = @_;
3171
3172 $self->SUPER::add (@widgets);
3173
3174 $self->{current} = $self->{children}[0]
3175 if @{ $self->{children} };
3176}
3177
3178sub get_current_page {
3179 my ($self) = @_;
3180
3181 $self->{current}
3182}
3183
3184sub set_current_page {
3185 my ($self, $page_or_widget) = @_;
3186
3187 my $widget = ref $page_or_widget
3188 ? $page_or_widget
3189 : $self->{children}[$page_or_widget];
3190
3191 $self->{current} = $widget;
3192 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3193
3194 $self->emit (page_changed => $self->{current});
3195
3196 $self->realloc;
3197}
3198
3199sub visible_children {
3200 $_[0]{current}
3201}
3202
3203sub size_request {
3204 my ($self) = @_;
3205
3206 $self->{current}->size_request
3207}
3208
3209sub invoke_size_allocate {
3210 my ($self, $w, $h) = @_;
3211
3212 $self->{current}->configure (0, 0, $w, $h);
3213
3214 1
3215}
3216
3217sub _draw {
3218 my ($self) = @_;
3219
3220 $self->{current}->draw;
3221}
3222
3223#############################################################################
3224
3225package CFClient::UI::Notebook;
3226
3227our @ISA = CFClient::UI::VBox::;
3228
3229sub new {
3230 my $class = shift;
3231
3232 my $self = $class->SUPER::new (
3233 buttonbar => (new CFClient::UI::Buttonbar),
3234 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3235 # filter => # will be put between multiplexer and $self
3236 @_,
3237 );
3238
3239 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3240 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3241
3242 $self
3243}
3244
3245sub add {
3246 my ($self, $title, $widget, $tooltip) = @_;
3247
3248 Scalar::Util::weaken $self;
3249
3250 $self->{buttonbar}->add (new CFClient::UI::Button
3251 markup => $title,
3252 tooltip => $tooltip,
3253 on_activate => sub { $self->set_current_page ($widget) },
3254 );
3255
3256 $self->{multiplexer}->add ($widget);
3257}
3258
3259sub get_current_page {
3260 my ($self) = @_;
3261
3262 $self->{multiplexer}->get_current_page
3263}
3264
3265sub set_current_page {
3266 my ($self, $page) = @_;
3267
3268 $self->{multiplexer}->set_current_page ($page);
3269 $self->emit (page_changed => $self->{multiplexer}{current});
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Combobox;
3275
3276use utf8;
3277
3278our @ISA = CFClient::UI::Button::;
3279
3280sub new {
3281 my $class = shift;
3282
3283 my $self = $class->SUPER::new (
3284 options => [], # [value, title, longdesc], ...
3285 value => undef,
3286 @_,
3287 );
3288
3289 $self->_set_value ($self->{value});
3290
3291 $self
3292}
3293
3294sub invoke_button_down {
3295 my ($self, $ev) = @_;
3296
3297 my @menu_items;
3298
3299 for (@{ $self->{options} }) {
3300 my ($value, $title, $tooltip) = @$_;
3301
3302 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3303 }
3304
3305 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3306}
3307
3308sub _set_value {
3309 my ($self, $value) = @_;
3310
3311 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3312 or return;
3313
3314 $self->{value} = $item->[0];
3315 $self->set_markup ("$item->[1] ⇓");
3316 $self->set_tooltip ($item->[2]);
3317}
3318
3319sub set_value {
3320 my ($self, $value) = @_;
3321
3322 return unless $self->{value} ne $value;
3323
3324 $self->_set_value ($value);
3325 $self->emit (changed => $value);
3326}
3327
3328#############################################################################
3329
3330package CFClient::UI::Statusbox;
3331
3332our @ISA = CFClient::UI::VBox::;
3333
3334sub new {
3335 my $class = shift;
3336
3337 my $self = $class->SUPER::new (
2900 fontsize => 0.8, 3338 fontsize => 0.8,
2901 @_, 3339 @_,
2902 ) 3340 );
3341
3342 Scalar::Util::weaken (my $this = $self);
3343
3344 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3345
3346 $self
2903} 3347}
2904 3348
2905sub reorder { 3349sub reorder {
2906 my ($self) = @_; 3350 my ($self) = @_;
2907 my $NOW = time; 3351 my $NOW = Time::HiRes::time;
3352
3353 # freeze display when hovering over any label
3354 return if $CFClient::UI::TOOLTIP->{owner}
3355 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3356 values %{ $self->{item} };
2908 3357
2909 while (my ($k, $v) = each %{ $self->{item} }) { 3358 while (my ($k, $v) = each %{ $self->{item} }) {
2910 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3359 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2911 } 3360 }
2912 3361
… …
2915 my @items = sort { 3364 my @items = sort {
2916 $a->{pri} <=> $b->{pri} 3365 $a->{pri} <=> $b->{pri}
2917 or $b->{id} <=> $a->{id} 3366 or $b->{id} <=> $a->{id}
2918 } values %{ $self->{item} }; 3367 } values %{ $self->{item} };
2919 3368
3369 $self->{timer}->interval (1);
3370
2920 my $count = 10 + 1; 3371 my $count = 10 + 1;
2921 for my $item (@items) { 3372 for my $item (@items) {
2922 last unless --$count; 3373 last unless --$count;
2923 3374
2924 push @widgets, $item->{label} ||= do { 3375 my $label = $item->{label} ||= do {
2925 # TODO: doesn't handle markup well (read as: at all) 3376 # TODO: doesn't handle markup well (read as: at all)
2926 my $short = $item->{count} > 1 3377 my $short = $item->{count} > 1
2927 ? "<b>$item->{count} ×</b> $item->{text}" 3378 ? "<b>$item->{count} ×</b> $item->{text}"
2928 : $item->{text}; 3379 : $item->{text};
2929 3380
… …
2937 tooltip => $item->{tooltip}, 3388 tooltip => $item->{tooltip},
2938 tooltip_font => $::FONT_PROP, 3389 tooltip_font => $::FONT_PROP,
2939 tooltip_width => 0.67, 3390 tooltip_width => 0.67,
2940 fontsize => $item->{fontsize} || $self->{fontsize}, 3391 fontsize => $item->{fontsize} || $self->{fontsize},
2941 max_w => $::WIDTH * 0.44, 3392 max_w => $::WIDTH * 0.44,
2942 fg => $item->{fg}, 3393 fg => [@{ $item->{fg} }],
2943 can_events => 1, 3394 can_events => 1,
2944 can_hover => 1 3395 can_hover => 1
2945 }; 3396 };
3397
3398 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3399 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3400 $label->update;
3401 $label->set_max_size (undef, $label->{req_h} * $diff)
3402 if $diff < 1;
3403 $self->{timer}->interval (1/30);
3404 } else {
3405 $label->{fg}[3] = $item->{fg}[3] || 1;
3406 }
3407
3408 push @widgets, $label;
2946 } 3409 }
2947 3410
2948 $self->clear; 3411 $self->clear;
2949 $self->SUPER::add (reverse @widgets); 3412 $self->SUPER::add (reverse @widgets);
2950} 3413}
… …
2955 $text =~ s/^\s+//; 3418 $text =~ s/^\s+//;
2956 $text =~ s/\s+$//; 3419 $text =~ s/\s+$//;
2957 3420
2958 return unless $text; 3421 return unless $text;
2959 3422
2960 my $timeout = time + ((delete $arg{timeout}) || 60); 3423 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2961 3424
2962 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3425 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2963 3426
2964 if (my $item = $self->{item}{$group}) { 3427 if (my $item = $self->{item}{$group}) {
2965 if ($item->{text} eq $text) { 3428 if ($item->{text} eq $text) {
2966 $item->{count}++; 3429 $item->{count}++;
2967 } else { 3430 } else {
2968 $item->{count} = 1; 3431 $item->{count} = 1;
2969 $item->{text} = $item->{tooltip} = $text; 3432 $item->{text} = $item->{tooltip} = $text;
2970 } 3433 }
2971 $item->{id} = ++$self->{id}; 3434 $item->{id} += 0.2;#d#
2972 $item->{timeout} = $timeout; 3435 $item->{timeout} = $timeout;
2973 delete $item->{label}; 3436 delete $item->{label};
2974 } else { 3437 } else {
2975 $self->{item}{$group} = { 3438 $self->{item}{$group} = {
2976 id => ++$self->{id}, 3439 id => ++$self->{id},
… …
2982 count => 1, 3445 count => 1,
2983 %arg, 3446 %arg,
2984 }; 3447 };
2985 } 3448 }
2986 3449
3450 $ROOT->on_refresh (reorder => sub {
2987 $self->reorder; 3451 $self->reorder;
3452 });
2988} 3453}
2989 3454
2990sub reconfigure { 3455sub reconfigure {
2991 my ($self) = @_; 3456 my ($self) = @_;
2992 3457
… …
2995 3460
2996 $self->reorder; 3461 $self->reorder;
2997 $self->SUPER::reconfigure; 3462 $self->SUPER::reconfigure;
2998} 3463}
2999 3464
3465sub destroy {
3466 my ($self) = @_;
3467
3468 $self->{timer}->cancel;
3469
3470 $self->SUPER::destroy;
3471}
3472
3000############################################################################# 3473#############################################################################
3001 3474
3475package CFClient::UI::Inventory;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 col_expand => [0, 1, 0],
3484 @_,
3485 );
3486
3487 $self
3488}
3489
3490sub set_items {
3491 my ($self, $items) = @_;
3492
3493 $self->clear;
3494 return unless $items;
3495
3496 my @items = sort {
3497 ($a->{type} <=> $b->{type})
3498 or ($a->{name} cmp $b->{name})
3499 } values %$items;
3500
3501 $self->{real_items} = \@items;
3502
3503 my $row = 0;
3504 for my $item (@items) {
3505 CFClient::Item::update_widgets $item;
3506
3507 $self->add (0, $row, $item->{face_widget});
3508 $self->add (1, $row, $item->{desc_widget});
3509 $self->add (2, $row, $item->{weight_widget});
3510
3511 $row++;
3512 }
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::SpellList;
3518
3519our @ISA = CFClient::UI::Table::;
3520
3521sub new {
3522 my $class = shift;
3523
3524 my $self = $class->SUPER::new (
3525 binding => [],
3526 commands => [],
3527 @_,
3528 )
3529}
3530
3531my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3532
3533my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3534 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3535my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3536 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3537my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3538 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3539my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3540 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3541my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3542 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3543
3544sub rebuild_spell_list {
3545 my ($self) = @_;
3546
3547 $CFClient::UI::ROOT->on_refresh ($self => sub {
3548 $self->clear;
3549
3550 return unless $::CONN;
3551
3552 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3553 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3554 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3555 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3556 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3557
3558 my $row = 0;
3559
3560 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3561 my $spell = $self->{spell}{$_};
3562
3563 $row++;
3564
3565 my $spell_cb = sub {
3566 my ($widget, $ev) = @_;
3567
3568 if ($ev->{button} == 1) {
3569 $::CONN->user_send ("cast $spell->{name}");
3570 } elsif ($ev->{button} == 2) {
3571 $::CONN->user_send ("invoke $spell->{name}");
3572 } elsif ($ev->{button} == 3) {
3573 (new CFClient::UI::Menu
3574 items => [
3575 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3576 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3577 ],
3578 )->popup ($ev);
3579 } else {
3580 return 0;
3581 }
3582
3583 1
3584 };
3585
3586 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3587
3588 #TODO: add path info to tooltip
3589 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3590
3591 $self->add (0, $row, new CFClient::UI::Face
3592 face => $spell->{face},
3593 can_hover => 1,
3594 can_events => 1,
3595 tooltip => $tooltip,
3596 on_button_down => $spell_cb,
3597 );
3598
3599 $self->add (1, $row, new CFClient::UI::Label
3600 expand => 1,
3601 text => $spell->{name},
3602 can_hover => 1,
3603 can_events => 1,
3604 tooltip => $tooltip,
3605 on_button_down => $spell_cb,
3606 );
3607
3608 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3609 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3610 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3611 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3612 }
3613 });
3614}
3615
3616sub add_spell {
3617 my ($self, $spell) = @_;
3618
3619 $self->{spell}->{$spell->{name}} = $spell;
3620 $self->rebuild_spell_list;
3621}
3622
3623sub remove_spell {
3624 my ($self, $spell) = @_;
3625
3626 delete $self->{spell}->{$spell->{name}};
3627 $self->rebuild_spell_list;
3628}
3629
3630sub clear_spells {
3631 my ($self) = @_;
3632
3633 $self->{spell} = {};
3634 $self->rebuild_spell_list;
3635}
3636
3637#############################################################################
3638
3002package CFClient::UI::Root; 3639package CFClient::UI::Root;
3003 3640
3004our @ISA = CFClient::UI::Container::; 3641our @ISA = CFClient::UI::Container::;
3642
3643use List::Util qw(min max);
3005 3644
3006use CFClient::OpenGL; 3645use CFClient::OpenGL;
3007 3646
3008sub new { 3647sub new {
3009 my $class = shift; 3648 my $class = shift;
… …
3016 Scalar::Util::weaken ($self->{root} = $self); 3655 Scalar::Util::weaken ($self->{root} = $self);
3017 3656
3018 $self 3657 $self
3019} 3658}
3020 3659
3021sub configure {
3022 my ($self, $x, $y, $w, $h) = @_;
3023
3024 $self->{w} = $w;
3025 $self->{h} = $h;
3026}
3027
3028sub reconfigure {
3029 my ($self) = @_;
3030
3031 $self->SUPER::reconfigure;
3032
3033 $self->size_allocate ($self->{w}, $self->{h}, 1)
3034 if $self->{w};
3035}
3036
3037sub size_request { 3660sub size_request {
3038 my ($self) = @_; 3661 my ($self) = @_;
3039 3662
3040 ($self->{w}, $self->{h}) 3663 ($self->{w}, $self->{h})
3041} 3664}
… …
3052 $coord = $max - $size if $coord > $max - $size; 3675 $coord = $max - $size if $coord > $max - $size;
3053 3676
3054 int $coord + 0.5 3677 int $coord + 0.5
3055} 3678}
3056 3679
3057sub size_allocate { 3680sub invoke_size_allocate {
3058 my ($self, $w, $h, $changed) = @_; 3681 my ($self, $w, $h) = @_;
3059 3682
3060 for my $child ($self->children) { 3683 for my $child ($self->children) {
3061 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3684 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3062 3685
3063 $X = $child->{force_x} if exists $child->{force_x}; 3686 $X = $child->{force_x} if exists $child->{force_x};
… …
3066 $X = _to_pixel $X, $W, $self->{w}; 3689 $X = _to_pixel $X, $W, $self->{w};
3067 $Y = _to_pixel $Y, $H, $self->{h}; 3690 $Y = _to_pixel $Y, $H, $self->{h};
3068 3691
3069 $child->configure ($X, $Y, $W, $H); 3692 $child->configure ($X, $Y, $W, $H);
3070 } 3693 }
3694
3695 1
3071} 3696}
3072 3697
3073sub coord2local { 3698sub coord2local {
3074 my ($self, $x, $y) = @_; 3699 my ($self, $x, $y) = @_;
3075 3700
… …
3131 $_->() 3756 $_->()
3132 for values %{delete $self->{refresh_hook}}; 3757 for values %{delete $self->{refresh_hook}};
3133 } 3758 }
3134 3759
3135 if ($self->{realloc}) { 3760 if ($self->{realloc}) {
3761 my %queue;
3136 my @queue; 3762 my @queue;
3763 my $widget;
3137 3764
3765 outer:
3138 while () { 3766 while () {
3139 if ($self->{realloc}) { 3767 if (my $realloc = delete $self->{realloc}) {
3140 #TODO use array-of-depth approach 3768 for $widget (values %$realloc) {
3769 $widget->{visible} or next; # do not resize invisible widgets
3141 3770
3142 @queue = sort { $a->{visible} <=> $b->{visible} } 3771 $queue{$widget+0}++ and next; # duplicates are common
3143 @queue, values %{delete $self->{realloc}}; 3772
3773 push @{ $queue[$widget->{visible}] }, $widget;
3774 }
3144 } 3775 }
3145 3776
3777 while () {
3778 @queue or last outer;
3779
3146 my $widget = pop @queue || last; 3780 $widget = pop @{ $queue[-1] || [] }
3781 and last;
3782
3783 pop @queue;
3784 }
3147 3785
3148 $widget->{visible} or last; # do not resize invisible widgets 3786 delete $queue{$widget+0};
3149 3787
3150 my ($w, $h) = $widget->size_request; 3788 my ($w, $h) = $widget->size_request;
3151 3789
3152 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3790 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3153 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3791 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3792
3793 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3794 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3154 3795
3155 $w = $widget->{force_w} if exists $widget->{force_w}; 3796 $w = $widget->{force_w} if exists $widget->{force_w};
3156 $h = $widget->{force_h} if exists $widget->{force_h}; 3797 $h = $widget->{force_h} if exists $widget->{force_h};
3157 3798
3799 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3800 || delete $widget->{force_realloc}) {
3158 $widget->{req_w} = $w; 3801 $widget->{req_w} = $w;
3159 $widget->{req_h} = $h; 3802 $widget->{req_h} = $h;
3160 3803
3161 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3804 $self->{size_alloc}{$widget+0} = $widget;
3162 3805
3163 push @queue, $widget->{parent} 3806 if (my $parent = $widget->{parent}) {
3164 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3807 $self->{realloc}{$parent+0} = $parent
3808 unless $queue{$parent+0};
3809
3810 $parent->{force_size_alloc} = 1;
3811 $self->{size_alloc}{$parent+0} = $parent;
3812 }
3813 }
3814
3815 delete $self->{realloc}{$widget+0};
3165 } 3816 }
3166 } 3817 }
3167 3818
3168 while (my $size_alloc = delete $self->{size_alloc}) { 3819 while (my $size_alloc = delete $self->{size_alloc}) {
3169 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3820 my @queue = sort { $b->{visible} <=> $a->{visible} }
3170 values %$size_alloc; 3821 values %$size_alloc;
3171 3822
3172 while () { 3823 while () {
3173 my ($widget, $w, $h) = @{ pop @queue or last }; 3824 my $widget = pop @queue || last;
3174 3825
3175 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3826 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3176 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3177 3827
3178 $w = 0 if $w < 0; 3828 $w = 0 if $w < 0;
3179 $h = 0 if $h < 0; 3829 $h = 0 if $h < 0;
3180 3830
3831 $w = max $widget->{min_w}, $w;
3832 $h = max $widget->{min_h}, $h;
3833
3834 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3835 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3836
3181 $w = int $w + 0.5; 3837 $w = int $w + 0.5;
3182 $h = int $h + 0.5; 3838 $h = int $h + 0.5;
3183 3839
3184 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3840 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3841 $widget->{old_w} = $widget->{w};
3842 $widget->{old_h} = $widget->{h};
3185 3843
3186 $widget->{w} = $w; 3844 $widget->{w} = $w;
3187 $widget->{h} = $h; 3845 $widget->{h} = $h;
3188 3846
3189 $widget->emit (size_allocate => $w, $h, $changed); 3847 $widget->emit (size_allocate => $w, $h);
3848 }
3190 } 3849 }
3191 } 3850 }
3192 3851
3193 while ($self->{post_alloc_hook}) { 3852 while ($self->{post_alloc_hook}) {
3194 $_->() 3853 $_->()
3195 for values %{delete $self->{post_alloc_hook}}; 3854 for values %{delete $self->{post_alloc_hook}};
3196 } 3855 }
3856
3197 3857
3198 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3858 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3199 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3859 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3200 glClear GL_COLOR_BUFFER_BIT; 3860 glClear GL_COLOR_BUFFER_BIT;
3201 3861
… …
3203 glLoadIdentity; 3863 glLoadIdentity;
3204 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3864 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3205 glMatrixMode GL_MODELVIEW; 3865 glMatrixMode GL_MODELVIEW;
3206 glLoadIdentity; 3866 glLoadIdentity;
3207 3867
3868 {
3869 package CFClient::UI::Base;
3870
3871 ($draw_x, $draw_y, $draw_w, $draw_h) =
3872 (0, 0, $self->{w}, $self->{h});
3873 }
3874
3208 $self->_draw; 3875 $self->_draw;
3209} 3876}
3210 3877
3211############################################################################# 3878#############################################################################
3212 3879

Diff Legend

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