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.261 by elmex, Tue May 30 14:45:56 2006 UTC vs.
Revision 1.331 by root, Sun Jul 23 04:46:02 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}
… …
77sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
78 $FOCUS->emit (key_up => $_[0]) 80 $FOCUS->emit (key_up => $_[0])
79 if $FOCUS; 81 if $FOCUS;
80} 82}
81 83
84sub check_hover {
85 my ($widget) = @_;
86
87 if ($widget != $HOVER) {
88 my $hover = $HOVER; $HOVER = $widget;
89
90 $hover->update if $hover && $hover->{can_hover};
91 $HOVER->update if $HOVER && $HOVER->{can_hover};
92
93 $TOOLTIP_WATCHER->start;
94 }
95}
96
82sub feed_sdl_button_down_event { 97sub feed_sdl_button_down_event {
83 my ($ev) = @_; 98 my ($ev) = @_;
84 my ($x, $y) = ($ev->{x}, $ev->{y}); 99 my ($x, $y) = ($ev->{x}, $ev->{y});
85 100
86 if (!$BUTTON_STATE) { 101 unless ($BUTTON_STATE) {
87 my $widget = $ROOT->find_widget ($x, $y); 102 my $widget = $ROOT->find_widget ($x, $y);
88 103
89 $GRAB = $widget; 104 $GRAB = $widget;
90 $GRAB->update if $GRAB; 105 $GRAB->update if $GRAB;
91 106
92 check_tooltip; 107 $TOOLTIP_WATCHER->cb->();
93 } 108 }
94 109
95 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 110 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
96 111
97 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 112 if ($GRAB) {
98 if $GRAB; 113 if ($ev->{button} == 4 || $ev->{button} == 5) {
114 # mousewheel
115 $ev->{dx} = 0;
116 $ev->{dy} = $ev->{button} * 2 - 9;
117 $GRAB->emit (mouse_wheel => $ev);
118 } else {
119 $GRAB->emit (button_down => $ev)
120 }
121 }
99} 122}
100 123
101sub feed_sdl_button_up_event { 124sub feed_sdl_button_up_event {
102 my ($ev) = @_; 125 my ($ev) = @_;
103 my ($x, $y) = ($ev->{x}, $ev->{y});
104 126
105 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 127 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
106 128
107 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 129 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
108 130
109 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 131 $GRAB->emit (button_up => $ev)
110 if $GRAB; 132 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
111 133
112 if (!$BUTTON_STATE) { 134 unless ($BUTTON_STATE) {
113 my $grab = $GRAB; undef $GRAB; 135 my $grab = $GRAB; undef $GRAB;
114 $grab->update if $grab; 136 $grab->update if $grab;
115 $GRAB->update if $GRAB; 137 $GRAB->update if $GRAB;
116 138
117 check_tooltip; 139 check_hover $widget;
140 $TOOLTIP_WATCHER->cb->();
118 } 141 }
119} 142}
120 143
121sub feed_sdl_motion_event { 144sub feed_sdl_motion_event {
122 my ($ev) = @_; 145 my ($ev) = @_;
123 my ($x, $y) = ($ev->{x}, $ev->{y}); 146 my ($x, $y) = ($ev->{x}, $ev->{y});
124 147
125 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 148 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
126 149
127 if ($widget != $HOVER) { 150 check_hover $widget;
128 my $hover = $HOVER; $HOVER = $widget;
129 151
130 $hover->update if $hover && $hover->{can_hover}; 152 $HOVER->emit (mouse_motion => $ev)
131 $HOVER->update if $HOVER && $HOVER->{can_hover};
132
133 check_tooltip;
134 }
135
136 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
137 if $HOVER; 153 if $HOVER;
138} 154}
139 155
140# convert position array to integers 156# convert position array to integers
141sub harmonize { 157sub harmonize {
… …
170sub rescale_widgets { 186sub rescale_widgets {
171 my ($sx, $sy) = @_; 187 my ($sx, $sy) = @_;
172 188
173 for my $widget (values %WIDGET) { 189 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 190 if ($widget->{is_toplevel}) {
175 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 191 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 192 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
177 193
178 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 194 $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}; 195 $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}; 196 $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.]+$/; 197 $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}; 198 $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}; 199 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
184 200
185 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 201 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
186 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 202 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
187 203
188 } 204 }
189 } 205 }
190 206
191 reconfigure_widgets; 207 reconfigure_widgets;
208}
209
210#############################################################################
211
212package CFClient::UI::Event;
213
214sub xy {
215 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
192} 216}
193 217
194############################################################################# 218#############################################################################
195 219
196package CFClient::UI::Base; 220package CFClient::UI::Base;
… …
270 294
271 return unless $self->{visible}; 295 return unless $self->{visible};
272 296
273 $_->set_invisible for $self->children; 297 $_->set_invisible for $self->children;
274 298
299 delete $self->{visible};
275 delete $self->{root}; 300 delete $self->{root};
276 delete $self->{visible};
277 301
278 undef $GRAB if $GRAB == $self; 302 undef $GRAB if $GRAB == $self;
279 undef $HOVER if $HOVER == $self; 303 undef $HOVER if $HOVER == $self;
280 304
281 CFClient::UI::check_tooltip 305 $CFClient::UI::TOOLTIP_WATCHER->cb->()
282 if $TOOLTIP->{owner} == $self; 306 if $TOOLTIP->{owner} == $self;
283 307
284 $self->focus_out; 308 $self->emit ("focus_out");
285
286 $self->emit (visibility_change => 0); 309 $self->emit (visibility_change => 0);
287} 310}
288 311
289sub set_visibility { 312sub set_visibility {
290 my ($self, $visible) = @_; 313 my ($self, $visible) = @_;
… …
313} 336}
314 337
315sub move_abs { 338sub move_abs {
316 my ($self, $x, $y, $z) = @_; 339 my ($self, $x, $y, $z) = @_;
317 340
318 $self->{x} = List::Util::max 0, int $x; 341 $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; 342 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
320 $self->{z} = $z if defined $z; 343 $self->{z} = $z if defined $z;
321 344
322 $self->update; 345 $self->update;
323} 346}
324 347
… …
332} 355}
333 356
334sub size_request { 357sub size_request {
335 require Carp; 358 require Carp;
336 Carp::confess "size_request is abstract"; 359 Carp::confess "size_request is abstract";
360}
361
362sub baseline_shift {
363 0
337} 364}
338 365
339sub configure { 366sub configure {
340 my ($self, $x, $y, $w, $h) = @_; 367 my ($self, $x, $y, $w, $h) = @_;
341 368
… …
365 392
366 $self->{root}{size_alloc}{$self+0} = $self; 393 $self->{root}{size_alloc}{$self+0} = $self;
367 } 394 }
368} 395}
369 396
370sub size_allocate {
371 # nothing to be done
372}
373
374sub children { 397sub children {
398 # nop
399}
400
401sub visible_children {
402 $_[0]->children
375} 403}
376 404
377sub set_max_size { 405sub set_max_size {
378 my ($self, $w, $h) = @_; 406 my ($self, $w, $h) = @_;
379 407
380 delete $self->{max_w}; $self->{max_w} = $w if $w; 408 $self->{max_w} = int $w if defined $w;
381 delete $self->{max_h}; $self->{max_h} = $h if $h; 409 $self->{max_h} = int $h if defined $h;
410
411 $self->realloc;
382} 412}
383 413
384sub set_tooltip { 414sub set_tooltip {
385 my ($self, $tooltip) = @_; 415 my ($self, $tooltip) = @_;
386 416
… …
391 421
392 $self->{tooltip} = $tooltip; 422 $self->{tooltip} = $tooltip;
393 423
394 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 424 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
395 delete $CFClient::UI::TOOLTIP->{owner}; 425 delete $CFClient::UI::TOOLTIP->{owner};
396 CFClient::UI::check_tooltip; 426 $CFClient::UI::TOOLTIP_WATCHER->cb->();
397 } 427 }
398} 428}
399 429
400# translate global coordinates to local coordinate system 430# translate global coordinates to local coordinate system
401sub coord2local { 431sub coord2local {
402 my ($self, $x, $y) = @_; 432 my ($self, $x, $y) = @_;
403 433
434 Carp::confess unless $self->{parent};#d#
435
404 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 436 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
405} 437}
406 438
407# translate local coordinates to global coordinate system 439# translate local coordinates to global coordinate system
408sub coord2global { 440sub coord2global {
409 my ($self, $x, $y) = @_; 441 my ($self, $x, $y) = @_;
410 442
411 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 443 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
412} 444}
413 445
414sub focus_in { 446sub invoke_focus_in {
415 my ($self) = @_; 447 my ($self) = @_;
416 448
417 return if $FOCUS == $self; 449 return if $FOCUS == $self;
418 return unless $self->{can_focus}; 450 return unless $self->{can_focus};
419 451
420 my $focus = $FOCUS; $FOCUS = $self; 452 $FOCUS = $self;
421 453
422 $self->_emit (focus_in => $focus); 454 $self->update;
423 455
424 $focus->update if $focus; 456 0
425 $FOCUS->update;
426} 457}
427 458
428sub focus_out { 459sub invoke_focus_out {
429 my ($self) = @_; 460 my ($self) = @_;
430 461
431 return unless $FOCUS == $self; 462 return unless $FOCUS == $self;
432 463
433 my $focus = $FOCUS; undef $FOCUS; 464 undef $FOCUS;
434 465
435 $self->_emit (focus_out => $focus); 466 $self->update;
436 467
437 $focus->update if $focus; #?
438
439 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 468 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
440 unless $FOCUS; 469 unless $FOCUS;
441}
442 470
471 0
472}
473
474sub grab_focus {
475 my ($self) = @_;
476
477 $FOCUS->emit ("focus_out") if $FOCUS;
478 $self->emit ("focus_in");
479}
480
443sub mouse_motion { } 481sub invoke_mouse_motion { 0 }
444sub button_up { } 482sub invoke_button_up { 0 }
445sub key_down { } 483sub invoke_key_down { 0 }
446sub key_up { } 484sub invoke_key_up { 0 }
485sub invoke_mouse_wheel { 0 }
447 486
448sub button_down { 487sub invoke_button_down {
449 my ($self, $ev, $x, $y) = @_; 488 my ($self, $ev, $x, $y) = @_;
450 489
451 $self->focus_in; 490 $self->grab_focus;
452}
453 491
454sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 492 0
455sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 493}
456sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 494
457sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 495sub connect {
458sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 496 my ($self, $signal, $cb) = @_;
497
498 push @{ $self->{signal_cb}{$signal} }, $cb;
499}
500
501my %has_coords = (
502 button_down => 1,
503 button_up => 1,
504 mouse_motion => 1,
505 mouse_wheel => 1,
506);
507
508sub emit {
509 my ($self, $signal, @args) = @_;
510
511 my @append
512 = $has_coords{$signal}
513 ? $args[0]->xy ($self)
514 : ();
515
516 #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517
518 #d##TODO# stop propagating at first true, do not use sum
519 (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
520 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
521 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
522}
459 523
460sub find_widget { 524sub find_widget {
461 my ($self, $x, $y) = @_; 525 my ($self, $x, $y) = @_;
462 526
463 return () unless $self->{can_events}; 527 return () unless $self->{can_events};
… …
472sub set_parent { 536sub set_parent {
473 my ($self, $parent) = @_; 537 my ($self, $parent) = @_;
474 538
475 Scalar::Util::weaken ($self->{parent} = $parent); 539 Scalar::Util::weaken ($self->{parent} = $parent);
476 $self->set_visible if $parent->{visible}; 540 $self->set_visible if $parent->{visible};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496}
497
498sub visibility_change {
499 #my ($self, $visible) = @_;
500} 541}
501 542
502sub realloc { 543sub realloc {
503 my ($self) = @_; 544 my ($self) = @_;
504 545
… …
525 566
526 $self->realloc; 567 $self->realloc;
527 $self->update; 568 $self->update;
528} 569}
529 570
571# using global variables seems a bit hacky, but passing through all drawing
572# functions seems pointless.
573our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
574
530sub draw { 575sub draw {
531 my ($self) = @_; 576 my ($self) = @_;
532 577
533 return unless $self->{h} && $self->{w}; 578 return unless $self->{h} && $self->{w};
579
580 # update screen rectangle
581 local $draw_x = $draw_x + $self->{x};
582 local $draw_y = $draw_y + $self->{y};
583
584 # skip widgets that are entirely outside the drawing area
585 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
586 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
534 587
535 glPushMatrix; 588 glPushMatrix;
536 glTranslate $self->{x}, $self->{y}, 0; 589 glTranslate $self->{x}, $self->{y}, 0;
537 $self->_draw;
538 glPopMatrix;
539 590
540 if ($self == $HOVER && $self->{can_hover}) { 591 if ($self == $HOVER && $self->{can_hover}) {
541 my ($x, $y) = @$self{qw(x y)};
542
543 glColor 1, 0.8, 0.5, 0.2; 592 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
544 glEnable GL_BLEND; 593 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 594 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glBegin GL_QUADS; 595 glBegin GL_QUADS;
547 glVertex $x , $y; 596 glVertex 0 , 0;
548 glVertex $x + $self->{w}, $y; 597 glVertex $self->{w}, 0;
549 glVertex $x + $self->{w}, $y + $self->{h}; 598 glVertex $self->{w}, $self->{h};
550 glVertex $x , $y + $self->{h}; 599 glVertex 0 , $self->{h};
551 glEnd; 600 glEnd;
552 glDisable GL_BLEND; 601 glDisable GL_BLEND;
553 } 602 }
554 603
555 if ($ENV{CFPLUS_DEBUG} & 1) { 604 if ($ENV{CFPLUS_DEBUG} & 1) {
556 glPushMatrix; 605 glPushMatrix;
557 glColor 1, 1, 0, 1; 606 glColor 1, 1, 0, 1;
558 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 607 glTranslate 0.375, 0.375;
559 glBegin GL_LINE_LOOP; 608 glBegin GL_LINE_LOOP;
560 glVertex 0 , 0; 609 glVertex 0 , 0;
561 glVertex $self->{w} - 1, 0; 610 glVertex $self->{w} - 1, 0;
562 glVertex $self->{w} - 1, $self->{h} - 1; 611 glVertex $self->{w} - 1, $self->{h} - 1;
563 glVertex 0 , $self->{h} - 1; 612 glVertex 0 , $self->{h} - 1;
564 glEnd; 613 glEnd;
565 glPopMatrix; 614 glPopMatrix;
566 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 615 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
567 } 616 }
617
618 $self->_draw;
619 glPopMatrix;
568} 620}
569 621
570sub _draw { 622sub _draw {
571 my ($self) = @_; 623 my ($self) = @_;
572 624
… …
574} 626}
575 627
576sub DESTROY { 628sub DESTROY {
577 my ($self) = @_; 629 my ($self) = @_;
578 630
631 return if CFClient::in_destruct;
632
579 delete $WIDGET{$self+0}; 633 delete $WIDGET{$self+0};
580 #$self->deactivate; 634
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
581} 637}
582 638
583############################################################################# 639#############################################################################
584 640
585package CFClient::UI::DrawBG; 641package CFClient::UI::DrawBG;
… …
610 666
611 if ($color && (@$color < 4 || $color->[3])) { 667 if ($color && (@$color < 4 || $color->[3])) {
612 my ($w, $h) = @$self{qw(w h)}; 668 my ($w, $h) = @$self{qw(w h)};
613 669
614 glEnable GL_BLEND; 670 glEnable GL_BLEND;
615 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 671 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616 glColor @$color; 672 glColor_premultiply @$color;
617 673
618 glBegin GL_QUADS; 674 glBegin GL_QUADS;
619 glVertex 0 , 0; 675 glVertex 0 , 0;
620 glVertex 0 , $h; 676 glVertex 0 , $h;
621 glVertex $w, $h; 677 glVertex $w, $h;
… …
652our @ISA = CFClient::UI::Base::; 708our @ISA = CFClient::UI::Base::;
653 709
654sub new { 710sub new {
655 my ($class, %arg) = @_; 711 my ($class, %arg) = @_;
656 712
657 my $children = delete $arg{children} || []; 713 my $children = delete $arg{children};
658 714
659 my $self = $class->SUPER::new ( 715 my $self = $class->SUPER::new (
660 children => [], 716 children => [],
661 can_events => 0, 717 can_events => 0,
662 %arg, 718 %arg,
663 ); 719 );
720
664 $self->add ($_) for @$children; 721 $self->add (@$children)
722 if $children;
665 723
666 $self 724 $self
667} 725}
668 726
669sub add { 727sub add {
… …
717 $x -= $self->{x}; 775 $x -= $self->{x};
718 $y -= $self->{y}; 776 $y -= $self->{y};
719 777
720 my $res; 778 my $res;
721 779
722 for (reverse @{ $self->{children} }) { 780 for (reverse $self->visible_children) {
723 $res = $_->find_widget ($x, $y) 781 $res = $_->find_widget ($x, $y)
724 and return $res; 782 and return $res;
725 } 783 }
726 784
727 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 785 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748} 806}
749 807
750sub add { 808sub add {
751 my ($self, $child) = @_; 809 my ($self, $child) = @_;
752 810
753 $self->{children} = []; 811 $self->SUPER::remove ($_) for @{ $self->{children} };
754
755 $self->SUPER::add ($child); 812 $self->SUPER::add ($child);
756} 813}
757 814
758sub remove { 815sub remove {
759 my ($self, $widget) = @_; 816 my ($self, $widget) = @_;
… …
768 825
769sub size_request { 826sub size_request {
770 $_[0]{children}[0]->size_request 827 $_[0]{children}[0]->size_request
771} 828}
772 829
773sub size_allocate { 830sub invoke_size_allocate {
774 my ($self, $w, $h) = @_; 831 my ($self, $w, $h) = @_;
775 832
776 $self->{children}[0]->configure (0, 0, $w, $h); 833 $self->{children}[0]->configure (0, 0, $w, $h);
834
835 1
777} 836}
778 837
779############################################################################# 838#############################################################################
839
840# back-buffered drawing area
780 841
781package CFClient::UI::Window; 842package CFClient::UI::Window;
782 843
783our @ISA = CFClient::UI::Bin::; 844our @ISA = CFClient::UI::Bin::;
784 845
… …
795 856
796 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 857 $ROOT->on_post_alloc ($self => sub { $self->render_child });
797 $self->SUPER::update; 858 $self->SUPER::update;
798} 859}
799 860
800sub size_allocate { 861sub invoke_size_allocate {
801 my ($self, $w, $h) = @_; 862 my ($self, $w, $h) = @_;
802 863
803 $self->SUPER::size_allocate ($w, $h);
804 $self->update; 864 $self->update;
865
866 $self->SUPER::invoke_size_allocate ($w, $h)
805} 867}
806 868
807sub _render { 869sub _render {
870 my ($self) = @_;
871
808 $_[0]{children}[0]->draw; 872 $self->{children}[0]->draw;
809} 873}
810 874
811sub render_child { 875sub render_child {
812 my ($self) = @_; 876 my ($self) = @_;
813 877
814 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 878 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
815 glClearColor 0, 0, 0, 0; 879 glClearColor 0, 0, 0, 0;
816 glClear GL_COLOR_BUFFER_BIT; 880 glClear GL_COLOR_BUFFER_BIT;
817 881
882 {
883 package CFClient::UI::Base;
884
885 ($draw_x, $draw_y, $draw_w, $draw_h) =
886 (0, 0, $self->{w}, $self->{h});
887 }
888
818 $self->_render; 889 $self->_render;
819 }; 890 };
820} 891}
821 892
822sub _draw { 893sub _draw {
823 my ($self) = @_; 894 my ($self) = @_;
824 895
825 my ($w, $h) = ($self->w, $self->h); 896 my ($w, $h) = @$self{qw(w h)};
826 897
827 my $tex = $self->{texture} 898 my $tex = $self->{texture}
828 or return; 899 or return;
829 900
830 glEnable GL_TEXTURE_2D; 901 glEnable GL_TEXTURE_2D;
831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 902 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
832 glColor 1, 1, 1, 1; 903 glColor 0, 0, 0, 1;
833 904
834 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 905 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
835 906
836 glDisable GL_TEXTURE_2D; 907 glDisable GL_TEXTURE_2D;
837} 908}
… …
861 $h = 10 if $self->{scroll_y}; 932 $h = 10 if $self->{scroll_y};
862 933
863 ($w, $h) 934 ($w, $h)
864} 935}
865 936
866sub size_allocate { 937sub invoke_size_allocate {
867 my ($self, $w, $h) = @_; 938 my ($self, $w, $h) = @_;
868 939
869 my $child = $self->child; 940 my $child = $self->child;
870 941
871 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w}; 942 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
872 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h}; 943 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
873 944
874 $self->child->configure (0, 0, $w, $h); 945 $self->child->configure (0, 0, $w, $h);
875 $self->update; 946 $self->update;
947
948 1
876} 949}
877 950
878sub set_offset { 951sub set_offset {
879 my ($self, $x, $y) = @_; 952 my ($self, $x, $y) = @_;
880 953
… …
913} 986}
914 987
915sub _render { 988sub _render {
916 my ($self) = @_; 989 my ($self) = @_;
917 990
991 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
992 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
993
918 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 994 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
919 995
920 $self->SUPER::_render; 996 $self->SUPER::_render;
921} 997}
922 998
… …
925package CFClient::UI::ScrolledWindow; 1001package CFClient::UI::ScrolledWindow;
926 1002
927our @ISA = CFClient::UI::HBox::; 1003our @ISA = CFClient::UI::HBox::;
928 1004
929sub new { 1005sub new {
930 my $class = shift; 1006 my ($class, %arg) = @_;
1007
1008 my $child = delete $arg{child};
931 1009
932 my $self; 1010 my $self;
933 1011
934 my $slider = new CFClient::UI::Slider 1012 my $slider = new CFClient::UI::Slider
935 vertical => 1, 1013 vertical => 1,
… …
938 $self->{vp}->set_offset (0, $_[1]); 1016 $self->{vp}->set_offset (0, $_[1]);
939 }, 1017 },
940 ; 1018 ;
941 1019
942 $self = $class->SUPER::new ( 1020 $self = $class->SUPER::new (
943 vp => (new CFClient::UI::ViewPort expand => 1), 1021 vp => (new CFClient::UI::ViewPort expand => 1),
1022 can_events => 1,
944 slider => $slider, 1023 slider => $slider,
945 @_, 1024 %arg,
946 ); 1025 );
947 1026
948 $self->{vp}->add ($self->{scrolled});
949 $self->add ($self->{vp});
950 $self->add ($self->{slider}); 1027 $self->SUPER::add ($self->{vp}, $self->{slider});
1028 $self->add ($child) if $child;
951 1029
952 $self 1030 $self
953} 1031}
954 1032
1033#TODO# update range on size_allocate depending on child
1034
1035sub add {
1036 my ($self, $widget) = @_;
1037
1038 $self->{vp}->add ($self->{child} = $widget);
1039}
1040
1041sub invoke_mouse_wheel {
1042 my ($self, $ev) = @_;
1043
1044 return 0 unless $ev->{dy}; # only vertical movements
1045
1046 $self->{slider}->emit (mouse_wheel => $ev);
1047
1048 1
1049}
1050
1051sub update_slider {
1052 my ($self) = @_;
1053
1054 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
1055}
1056
955sub update { 1057sub update {
956 my ($self) = @_; 1058 my ($self) = @_;
957 1059
958 $self->SUPER::update; 1060 $self->SUPER::update;
959 1061
960 # todo: overwrite size_allocate of child 1062 $self->update_slider;
961 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
963} 1063}
964 1064
965sub size_allocate { 1065sub invoke_size_allocate {
966 my ($self, $w, $h) = @_; 1066 my ($self, $w, $h) = @_;
967 1067
1068 $self->update_slider;
1069
968 $self->SUPER::size_allocate ($w, $h); 1070 $self->SUPER::invoke_size_allocate ($w, $h)
969
970 my $child = $self->{vp}->child;
971 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
972} 1071}
973
974#TODO# update range on size_allocate depending on child
975# update viewport offset on scroll
976 1072
977############################################################################# 1073#############################################################################
978 1074
979package CFClient::UI::Frame; 1075package CFClient::UI::Frame;
980 1076
… …
996 1092
997 if ($self->{bg}) { 1093 if ($self->{bg}) {
998 my ($w, $h) = @$self{qw(w h)}; 1094 my ($w, $h) = @$self{qw(w h)};
999 1095
1000 glEnable GL_BLEND; 1096 glEnable GL_BLEND;
1001 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1097 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1002 glColor @{ $self->{bg} }; 1098 glColor_premultiply @{ $self->{bg} };
1003 1099
1004 glBegin GL_QUADS; 1100 glBegin GL_QUADS;
1005 glVertex 0 , 0; 1101 glVertex 0 , 0;
1006 glVertex 0 , $h; 1102 glVertex 0 , $h;
1007 glVertex $w, $h; 1103 glVertex $w, $h;
… …
1029my @border = 1125my @border =
1030 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1126 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1031 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1127 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1032 1128
1033sub new { 1129sub new {
1034 my $class = shift; 1130 my ($class, %arg) = @_;
1035 1131
1036 my $self = $class->SUPER::new ( 1132 my $self = $class->SUPER::new (
1037 bg => [1, 1, 1, 1], 1133 bg => [1, 1, 1, 1],
1038 border_bg => [1, 1, 1, 1], 1134 border_bg => [1, 1, 1, 1],
1039 border => 0.6, 1135 border => 0.6,
1040 can_events => 1, 1136 can_events => 1,
1041 min_w => 16, 1137 min_w => 64,
1042 min_h => 16, 1138 min_h => 32,
1043 @_ 1139 %arg,
1044 ); 1140 );
1045 1141
1046 $self->{title} &&= new CFClient::UI::Label 1142 $self->{title_widget} = new CFClient::UI::Label
1047 align => 0, 1143 align => 0,
1048 valign => 1, 1144 valign => 1,
1049 text => $self->{title}, 1145 text => $self->{title},
1050 fontsize => $self->{border}; 1146 fontsize => $self->{border},
1147 if exists $self->{title};
1148
1149 if ($self->{has_close_button}) {
1150 $self->{close_button} =
1151 new CFClient::UI::ImageButton
1152 path => 'x1_close.png',
1153 on_activate => sub { $self->emit ("delete") };
1154
1155 $self->CFClient::UI::Container::add ($self->{close_button});
1156 }
1051 1157
1052 $self 1158 $self
1159}
1160
1161sub add {
1162 my ($self, @widgets) = @_;
1163
1164 $self->SUPER::add (@widgets);
1165 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1053} 1167}
1054 1168
1055sub border { 1169sub border {
1056 int $_[0]{border} * $::FONTSIZE 1170 int $_[0]{border} * $::FONTSIZE
1057} 1171}
1058 1172
1059sub size_request { 1173sub size_request {
1060 my ($self) = @_; 1174 my ($self) = @_;
1175
1176 $self->{title_widget}->size_request
1177 if $self->{title_widget};
1178
1179 $self->{close_button}->size_request
1180 if $self->{close_button};
1061 1181
1062 my ($w, $h) = $self->SUPER::size_request; 1182 my ($w, $h) = $self->SUPER::size_request;
1063 1183
1064 ( 1184 (
1065 $w + $self->border * 2, 1185 $w + $self->border * 2,
1066 $h + $self->border * 2, 1186 $h + $self->border * 2,
1067 ) 1187 )
1068} 1188}
1069 1189
1070sub size_allocate { 1190sub invoke_size_allocate {
1071 my ($self, $w, $h) = @_; 1191 my ($self, $w, $h) = @_;
1072 1192
1193 if ($self->{title_widget}) {
1194 $self->{title_widget}{w} = $w;
1195 $self->{title_widget}{h} = $h;
1196 $self->{title_widget}->invoke_size_allocate ($w, $h);
1197 }
1198
1199 my $border = $self->border;
1200
1073 $h -= List::Util::max 0, $self->border * 2; 1201 $h -= List::Util::max 0, $border * 2;
1074 $w -= List::Util::max 0, $self->border * 2; 1202 $w -= List::Util::max 0, $border * 2;
1075 1203
1076 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1077 if $self->{title};
1078
1079 $self->child->configure ($self->border, $self->border, $w, $h); 1204 $self->child->configure ($border, $border, $w, $h);
1080}
1081 1205
1206 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1207 if $self->{close_button};
1208
1209 1
1210}
1211
1212sub invoke_delete {
1213 my ($self) = @_;
1214
1215 $self->hide;
1216
1217 1
1218}
1219
1082sub button_down { 1220sub invoke_button_down {
1083 my ($self, $ev, $x, $y) = @_; 1221 my ($self, $ev, $x, $y) = @_;
1084 1222
1085 my ($w, $h) = @$self{qw(w h)}; 1223 my ($w, $h) = @$self{qw(w h)};
1086 my $border = $self->border; 1224 my $border = $self->border;
1087 1225
… …
1103 my $dy = $ev->{y} - $oy; 1241 my $dy = $ev->{y} - $oy;
1104 1242
1105 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1243 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1106 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1244 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1107 1245
1246 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1108 $self->realloc; 1247 $self->realloc;
1109 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1110 }; 1248 };
1111 1249
1112 } elsif ($lr ^ $td) { 1250 } elsif ($lr ^ $td) {
1113 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1251 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1114 my ($bx, $by) = ($self->{x}, $self->{y}); 1252 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1117 my ($ev, $x, $y) = @_; 1255 my ($ev, $x, $y) = @_;
1118 1256
1119 ($x, $y) = ($ev->{x}, $ev->{y}); 1257 ($x, $y) = ($ev->{x}, $ev->{y});
1120 1258
1121 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1259 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1260 # HACK: the next line is required to enforce placement
1261 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1122 }; 1262 };
1263 } else {
1264 return 0;
1265 }
1266
1123 } 1267 1
1124} 1268}
1125 1269
1126sub button_up { 1270sub invoke_button_up {
1127 my ($self, $ev, $x, $y) = @_; 1271 my ($self, $ev, $x, $y) = @_;
1128 1272
1129 delete $self->{motion}; 1273 ! ! delete $self->{motion}
1130} 1274}
1131 1275
1132sub mouse_motion { 1276sub invoke_mouse_motion {
1133 my ($self, $ev, $x, $y) = @_; 1277 my ($self, $ev, $x, $y) = @_;
1134 1278
1135 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1279 $self->{motion}->($ev, $x, $y) if $self->{motion};
1280
1281 ! ! $self->{motion}
1136} 1282}
1137 1283
1138sub _draw { 1284sub _draw {
1139 my ($self) = @_; 1285 my ($self) = @_;
1140 1286
1287 my $child = $self->{children}[0];
1288
1141 my ($w, $h ) = ($self->{w}, $self->{h}); 1289 my ($w, $h ) = ($self->{w}, $self->{h});
1142 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1290 my ($cw, $ch) = ($child->{w}, $child->{h});
1143 1291
1144 glEnable GL_TEXTURE_2D; 1292 glEnable GL_TEXTURE_2D;
1145 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1293 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1146 1294
1147 my $border = $self->border; 1295 my $border = $self->border;
… …
1162 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1310 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1163 } 1311 }
1164 1312
1165 glDisable GL_TEXTURE_2D; 1313 glDisable GL_TEXTURE_2D;
1166 1314
1167 $self->{title}->draw if $self->{title};
1168
1169 $self->child->draw; 1315 $child->draw;
1316
1317 if ($self->{title_widget}) {
1318 glTranslate 0, $border - $self->{h};
1319 $self->{title_widget}->_draw;
1320
1321 glTranslate 0, - ($border - $self->{h});
1322 }
1323
1324 $self->{close_button}->draw
1325 if $self->{close_button};
1170} 1326}
1171 1327
1172############################################################################# 1328#############################################################################
1173 1329
1174package CFClient::UI::Table; 1330package CFClient::UI::Table;
… …
1197 1353
1198 $child->set_parent ($self); 1354 $child->set_parent ($self);
1199 $self->{children}[$y][$x] = $child; 1355 $self->{children}[$y][$x] = $child;
1200 1356
1201 $self->realloc; 1357 $self->realloc;
1358}
1359
1360sub remove {
1361 my ($self, $child) = @_;
1362
1363 # TODO: not yet implemented
1202} 1364}
1203 1365
1204# TODO: move to container class maybe? send children a signal on removal? 1366# TODO: move to container class maybe? send children a signal on removal?
1205sub clear { 1367sub clear {
1206 my ($self) = @_; 1368 my ($self) = @_;
… …
1247 (sum @$ws), 1409 (sum @$ws),
1248 (sum @$hs), 1410 (sum @$hs),
1249 ) 1411 )
1250} 1412}
1251 1413
1252sub size_allocate { 1414sub invoke_size_allocate {
1253 my ($self, $w, $h) = @_; 1415 my ($self, $w, $h) = @_;
1254 1416
1255 my ($ws, $hs) = $self->get_wh; 1417 my ($ws, $hs) = $self->get_wh;
1256 1418
1257 my $req_w = (sum @$ws) || 1; 1419 my $req_w = (sum @$ws) || 1;
… …
1289 } 1451 }
1290 1452
1291 $y += $row_h; 1453 $y += $row_h;
1292 } 1454 }
1293 1455
1456 1
1294} 1457}
1295 1458
1296sub find_widget { 1459sub find_widget {
1297 my ($self, $x, $y) = @_; 1460 my ($self, $x, $y) = @_;
1298 1461
… …
1335 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1498 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1336 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1499 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1337 ) 1500 )
1338} 1501}
1339 1502
1340sub size_allocate { 1503sub invoke_size_allocate {
1341 my ($self, $w, $h) = @_; 1504 my ($self, $w, $h) = @_;
1342 1505
1343 my $space = $self->{vertical} ? $h : $w; 1506 my $space = $self->{vertical} ? $h : $w;
1344 my $children = $self->{children}; 1507 my @children = $self->visible_children;
1345 1508
1346 my @req; 1509 my @req;
1347 1510
1348 if ($self->{homogeneous}) { 1511 if ($self->{homogeneous}) {
1349 @req = ($space / (@$children || 1)) x @$children; 1512 @req = ($space / (@children || 1)) x @children;
1350 } else { 1513 } else {
1351 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1514 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1352 my $req = List::Util::sum @req; 1515 my $req = List::Util::sum @req;
1353 1516
1354 if ($req > $space) { 1517 if ($req > $space) {
1355 # ah well, not enough space 1518 # ah well, not enough space
1356 $_ *= $space / $req for @req; 1519 $_ *= $space / $req for @req;
1357 } else { 1520 } else {
1358 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1521 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1359 1522
1360 $space = ($space - $req) / $expand; # remaining space to give away 1523 $space = ($space - $req) / $expand; # remaining space to give away
1361 1524
1362 $req[$_] += $space * $children->[$_]{expand} 1525 $req[$_] += $space * $children[$_]{expand}
1363 for 0 .. $#$children; 1526 for 0 .. $#children;
1364 } 1527 }
1365 } 1528 }
1366 1529
1367 CFClient::UI::harmonize \@req; 1530 CFClient::UI::harmonize \@req;
1368 1531
1369 my $pos = 0; 1532 my $pos = 0;
1370 for (0 .. $#$children) { 1533 for (0 .. $#children) {
1371 my $alloc = $req[$_]; 1534 my $alloc = $req[$_];
1372 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1535 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1373 1536
1374 $pos += $alloc; 1537 $pos += $alloc;
1375 } 1538 }
1376 1539
1377 1 1540 1
… …
1467 1630
1468 delete $self->{texture}; 1631 delete $self->{texture};
1469 $self->SUPER::update; 1632 $self->SUPER::update;
1470} 1633}
1471 1634
1635sub realloc {
1636 my ($self) = @_;
1637
1638 delete $self->{ox};
1639 $self->SUPER::realloc;
1640}
1641
1472sub set_text { 1642sub set_text {
1473 my ($self, $text) = @_; 1643 my ($self, $text) = @_;
1474 1644
1475 return if $self->{text} eq "T$text"; 1645 return if $self->{text} eq "T$text";
1476 $self->{text} = "T$text"; 1646 $self->{text} = "T$text";
1477 1647
1478 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1479 $self->{layout}->set_text ($text); 1648 $self->{layout}->set_text ($text);
1480 1649
1650 delete $self->{size_req};
1481 $self->realloc; 1651 $self->realloc;
1482 $self->update; 1652 $self->update;
1483} 1653}
1484 1654
1485sub set_markup { 1655sub set_markup {
… …
1488 return if $self->{text} eq "M$markup"; 1658 return if $self->{text} eq "M$markup";
1489 $self->{text} = "M$markup"; 1659 $self->{text} = "M$markup";
1490 1660
1491 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1661 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1492 1662
1493 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1494 $self->{layout}->set_markup ($markup); 1663 $self->{layout}->set_markup ($markup);
1495 1664
1665 delete $self->{size_req};
1496 $self->realloc; 1666 $self->realloc;
1497 $self->update; 1667 $self->update;
1498} 1668}
1499 1669
1500sub size_request { 1670sub size_request {
1501 my ($self) = @_; 1671 my ($self) = @_;
1502 1672
1673 $self->{size_req} ||= do {
1503 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1674 $self->{layout}->set_font ($self->{font}) if $self->{font};
1504 $self->{layout}->set_width ($self->{max_w} || -1); 1675 $self->{layout}->set_width ($self->{max_w} || -1);
1505 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1676 $self->{layout}->set_ellipsise ($self->{ellipsise});
1506 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1677 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1507 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1678 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1508 1679
1509 my ($w, $h) = $self->{layout}->size; 1680 my ($w, $h) = $self->{layout}->size;
1510 1681
1511 if (exists $self->{template}) { 1682 if (exists $self->{template}) {
1512 $self->{template}->set_font ($self->{font}) if $self->{font}; 1683 $self->{template}->set_font ($self->{font}) if $self->{font};
1684 $self->{template}->set_width ($self->{max_w} || -1);
1513 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1685 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1514 1686
1515 my ($w2, $h2) = $self->{template}->size; 1687 my ($w2, $h2) = $self->{template}->size;
1516 1688
1517 $w = List::Util::max $w, $w2; 1689 $w = List::Util::max $w, $w2;
1518 $h = List::Util::max $h, $h2; 1690 $h = List::Util::max $h, $h2;
1691 }
1692
1693 [$w, $h]
1519 } 1694 };
1520 1695
1521 ($w, $h) 1696 @{ $self->{size_req} }
1522} 1697}
1523 1698
1699sub baseline_shift {
1700 $_[0]{layout}->descent
1701}
1702
1524sub size_allocate { 1703sub invoke_size_allocate {
1525 my ($self, $w, $h) = @_; 1704 my ($self, $w, $h) = @_;
1526 1705
1706 delete $self->{ox};
1707
1527 delete $self->{texture}; 1708 delete $self->{texture}
1709 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1710
1711 1
1528} 1712}
1529 1713
1530sub set_fontsize { 1714sub set_fontsize {
1531 my ($self, $fontsize) = @_; 1715 my ($self, $fontsize) = @_;
1532 1716
1533 $self->{fontsize} = $fontsize; 1717 $self->{fontsize} = $fontsize;
1718 delete $self->{size_req};
1534 delete $self->{texture}; 1719 delete $self->{texture};
1535 1720
1536 $self->realloc; 1721 $self->realloc;
1537} 1722}
1538 1723
1724sub reconfigure {
1725 my ($self) = @_;
1726
1727 delete $self->{size_req};
1728 delete $self->{texture};
1729
1730 $self->SUPER::reconfigure;
1731}
1732
1539sub _draw { 1733sub _draw {
1540 my ($self) = @_; 1734 my ($self) = @_;
1541 1735
1542 $self->SUPER::_draw; # draw background, if applicable 1736 $self->SUPER::_draw; # draw background, if applicable
1543 1737
1544 my $tex = $self->{texture} ||= do { 1738 my $size = $self->{texture} ||= do {
1545 $self->{layout}->set_foreground (@{$self->{fg}}); 1739 $self->{layout}->set_foreground (@{$self->{fg}});
1546 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1740 $self->{layout}->set_font ($self->{font}) if $self->{font};
1547 $self->{layout}->set_width ($self->{w}); 1741 $self->{layout}->set_width ($self->{w});
1548 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1742 $self->{layout}->set_ellipsise ($self->{ellipsise});
1549 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1743 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1550 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1744 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1551 1745
1552 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1746 [$self->{layout}->size]
1747 };
1553 1748
1749 unless (exists $self->{ox}) {
1554 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x} 1750 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1555 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x} 1751 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1556 : ($self->{w} - $tex->{w}) * 0.5); 1752 : ($self->{w} - $size->[0]) * 0.5);
1557 1753
1558 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y} 1754 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1559 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y} 1755 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1560 : ($self->{h} - $tex->{h}) * 0.5); 1756 : ($self->{h} - $size->[1]) * 0.5);
1561
1562 $tex
1563 }; 1757 };
1564 1758
1565 glEnable GL_TEXTURE_2D; 1759 my $w = List::Util::min $self->{w} + 4, $size->[0];
1566 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1760 my $h = List::Util::min $self->{h} + 2, $size->[1];
1567 1761
1568 if ($tex->{format} == GL_ALPHA) { 1762 $self->{layout}->render ($self->{ox}, $self->{oy});
1569 glColor @{$self->{fg}};
1570 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1571 } else {
1572 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1573 }
1574
1575 glDisable GL_TEXTURE_2D;
1576} 1763}
1577 1764
1578############################################################################# 1765#############################################################################
1579 1766
1580package CFClient::UI::EntryBase; 1767package CFClient::UI::EntryBase;
… …
1594 can_hover => 1, 1781 can_hover => 1,
1595 can_focus => 1, 1782 can_focus => 1,
1596 valign => 0, 1783 valign => 0,
1597 can_events => 1, 1784 can_events => 1,
1598 #text => ... 1785 #text => ...
1786 #hidden => "*",
1599 @_ 1787 @_
1600 ) 1788 )
1601} 1789}
1602 1790
1603sub _set_text { 1791sub _set_text {
… …
1605 1793
1606 delete $self->{cur_h}; 1794 delete $self->{cur_h};
1607 1795
1608 return if $self->{text} eq $text; 1796 return if $self->{text} eq $text;
1609 1797
1610 delete $self->{texture};
1611
1612 $self->{last_activity} = $::NOW; 1798 $self->{last_activity} = $::NOW;
1613 $self->{text} = $text; 1799 $self->{text} = $text;
1614 1800
1615 $text =~ s/./*/g if $self->{hidden}; 1801 $text =~ s/./*/g if $self->{hidden};
1616 $self->{layout}->set_text ("$text "); 1802 $self->{layout}->set_text ("$text ");
1803 delete $self->{size_req};
1617 1804
1618 $self->_emit (changed => $self->{text}); 1805 $self->emit (changed => $self->{text});
1806
1807 $self->realloc;
1808 $self->update;
1619} 1809}
1620 1810
1621sub set_text { 1811sub set_text {
1622 my ($self, $text) = @_; 1812 my ($self, $text) = @_;
1623 1813
1624 $self->{cursor} = length $text; 1814 $self->{cursor} = length $text;
1625 $self->_set_text ($text); 1815 $self->_set_text ($text);
1626
1627 $self->realloc;
1628} 1816}
1629 1817
1630sub get_text { 1818sub get_text {
1631 $_[0]{text} 1819 $_[0]{text}
1632} 1820}
… …
1637 my ($w, $h) = $self->SUPER::size_request; 1825 my ($w, $h) = $self->SUPER::size_request;
1638 1826
1639 ($w + 1, $h) # add 1 for cursor 1827 ($w + 1, $h) # add 1 for cursor
1640} 1828}
1641 1829
1642sub key_down { 1830sub invoke_key_down {
1643 my ($self, $ev) = @_; 1831 my ($self, $ev) = @_;
1644 1832
1645 my $mod = $ev->{mod}; 1833 my $mod = $ev->{mod};
1646 my $sym = $ev->{sym}; 1834 my $sym = $ev->{sym};
1647 my $uni = $ev->{unicode}; 1835 my $uni = $ev->{unicode};
… …
1659 } elsif ($sym == CFClient::SDLK_HOME) { 1847 } elsif ($sym == CFClient::SDLK_HOME) {
1660 $self->{cursor} = 0; 1848 $self->{cursor} = 0;
1661 } elsif ($sym == CFClient::SDLK_END) { 1849 } elsif ($sym == CFClient::SDLK_END) {
1662 $self->{cursor} = length $text; 1850 $self->{cursor} = length $text;
1663 } elsif ($uni == 27) { 1851 } elsif ($uni == 27) {
1664 $self->_emit ('escape'); 1852 $self->emit ('escape');
1665 } elsif ($uni) { 1853 } elsif ($uni) {
1666 substr $text, $self->{cursor}++, 0, chr $uni; 1854 substr $text, $self->{cursor}++, 0, chr $uni;
1855 } else {
1856 return 0;
1667 } 1857 }
1668 1858
1669 $self->_set_text ($text); 1859 $self->_set_text ($text);
1670 1860
1671 $self->realloc; 1861 $self->realloc;
1672}
1673 1862
1863 1
1864}
1865
1674sub focus_in { 1866sub invoke_focus_in {
1675 my ($self) = @_; 1867 my ($self) = @_;
1676 1868
1677 $self->{last_activity} = $::NOW; 1869 $self->{last_activity} = $::NOW;
1678 1870
1679 $self->SUPER::focus_in; 1871 $self->SUPER::invoke_focus_in
1680} 1872}
1681 1873
1682sub button_down { 1874sub invoke_button_down {
1683 my ($self, $ev, $x, $y) = @_; 1875 my ($self, $ev, $x, $y) = @_;
1684 1876
1685 $self->SUPER::button_down ($ev, $x, $y); 1877 $self->SUPER::invoke_button_down ($ev, $x, $y);
1686 1878
1687 my $idx = $self->{layout}->xy_to_index ($x, $y); 1879 my $idx = $self->{layout}->xy_to_index ($x, $y);
1688 1880
1689 # byte-index to char-index 1881 # byte-index to char-index
1690 my $text = $self->{text}; 1882 my $text = $self->{text};
1691 utf8::encode $text; 1883 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1692 $self->{cursor} = length substr $text, 0, $idx; 1884 $self->{cursor} = length $text;
1693 1885
1694 $self->_set_text ($self->{text}); 1886 $self->_set_text ($self->{text});
1695 $self->update; 1887 $self->update;
1888
1889 1
1696} 1890}
1697 1891
1698sub mouse_motion { 1892sub invoke_mouse_motion {
1699 my ($self, $ev, $x, $y) = @_; 1893 my ($self, $ev, $x, $y) = @_;
1700# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1894# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1895
1896 1
1701} 1897}
1702 1898
1703sub _draw { 1899sub _draw {
1704 my ($self) = @_; 1900 my ($self) = @_;
1705 1901
1706 local $self->{fg} = $self->{fg}; 1902 local $self->{fg} = $self->{fg};
1707 1903
1708 if ($FOCUS == $self) { 1904 if ($FOCUS == $self) {
1709 glColor @{$self->{active_bg}}; 1905 glColor_premultiply @{$self->{active_bg}};
1710 $self->{fg} = $self->{active_fg}; 1906 $self->{fg} = $self->{active_fg};
1711 } else { 1907 } else {
1712 glColor @{$self->{bg}}; 1908 glColor_premultiply @{$self->{bg}};
1713 } 1909 }
1714 1910
1715 glEnable GL_BLEND; 1911 glEnable GL_BLEND;
1716 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1912 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1717 glBegin GL_QUADS; 1913 glBegin GL_QUADS;
1718 glVertex 0 , 0; 1914 glVertex 0 , 0;
1719 glVertex 0 , $self->{h}; 1915 glVertex 0 , $self->{h};
1720 glVertex $self->{w}, $self->{h}; 1916 glVertex $self->{w}, $self->{h};
1721 glVertex $self->{w}, 0; 1917 glVertex $self->{w}, 0;
… …
1746 1942
1747our @ISA = CFClient::UI::EntryBase::; 1943our @ISA = CFClient::UI::EntryBase::;
1748 1944
1749use CFClient::OpenGL; 1945use CFClient::OpenGL;
1750 1946
1751sub key_down { 1947sub invoke_key_down {
1752 my ($self, $ev) = @_; 1948 my ($self, $ev) = @_;
1753 1949
1754 my $sym = $ev->{sym}; 1950 my $sym = $ev->{sym};
1755 1951
1756 if ($sym == 13) { 1952 if ($sym == 13) {
1757 unshift @{$self->{history}}, 1953 unshift @{$self->{history}},
1758 my $txt = $self->get_text; 1954 my $txt = $self->get_text;
1955
1759 $self->{history_pointer} = -1; 1956 $self->{history_pointer} = -1;
1760 $self->{history_saveback} = ''; 1957 $self->{history_saveback} = '';
1761 $self->_emit (activate => $txt); 1958 $self->emit (activate => $txt);
1762 $self->update; 1959 $self->update;
1763 1960
1764 } elsif ($sym == CFClient::SDLK_UP) { 1961 } elsif ($sym == CFClient::SDLK_UP) {
1765 if ($self->{history_pointer} < 0) { 1962 if ($self->{history_pointer} < 0) {
1766 $self->{history_saveback} = $self->get_text; 1963 $self->{history_saveback} = $self->get_text;
… …
1782 } else { 1979 } else {
1783 $self->set_text ($self->{history_saveback}); 1980 $self->set_text ($self->{history_saveback});
1784 } 1981 }
1785 1982
1786 } else { 1983 } else {
1787 $self->SUPER::key_down ($ev); 1984 return $self->SUPER::invoke_key_down ($ev)
1985 }
1986
1788 } 1987 1
1789
1790} 1988}
1791 1989
1792############################################################################# 1990#############################################################################
1793 1991
1794package CFClient::UI::Button; 1992package CFClient::UI::Button;
… …
1815 can_events => 1, 2013 can_events => 1,
1816 @_ 2014 @_
1817 ) 2015 )
1818} 2016}
1819 2017
1820sub activate { }
1821
1822sub button_up { 2018sub invoke_button_up {
1823 my ($self, $ev, $x, $y) = @_; 2019 my ($self, $ev, $x, $y) = @_;
1824 2020
1825 $self->emit ("activate") 2021 $self->emit ("activate")
1826 if $x >= 0 && $x < $self->{w} 2022 if $x >= 0 && $x < $self->{w}
1827 && $y >= 0 && $y < $self->{h}; 2023 && $y >= 0 && $y < $self->{h};
2024
2025 1
1828} 2026}
1829 2027
1830sub _draw { 2028sub _draw {
1831 my ($self) = @_; 2029 my ($self) = @_;
1832 2030
1833 local $self->{fg} = $self->{fg}; 2031 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1834
1835 if ($GRAB == $self) {
1836 $self->{fg} = $self->{active_fg};
1837 }
1838 2032
1839 glEnable GL_TEXTURE_2D; 2033 glEnable GL_TEXTURE_2D;
1840 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2034 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1841 glColor 0, 0, 0, 1; 2035 glColor 0, 0, 0, 1;
1842 2036
1843 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2037 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1844 2038
1845 glDisable GL_TEXTURE_2D; 2039 glDisable GL_TEXTURE_2D;
1846 2040
1847 $self->SUPER::_draw; 2041 $self->SUPER::_draw;
2042}
2043
2044#############################################################################
2045
2046package CFClient::UI::ImageButton;
2047
2048our @ISA = CFClient::UI::Image::;
2049
2050use CFClient::OpenGL;
2051
2052my %textures;
2053
2054sub new {
2055 my $class = shift;
2056
2057 my $self = $class->SUPER::new (
2058 padding_x => 4,
2059 padding_y => 4,
2060 fg => [1, 1, 1],
2061 active_fg => [0, 0, 1],
2062 can_hover => 1,
2063 align => 0,
2064 valign => 0,
2065 can_events => 1,
2066 @_
2067 );
2068}
2069
2070sub invoke_button_up {
2071 my ($self, $ev, $x, $y) = @_;
2072
2073 $self->emit ("activate")
2074 if $x >= 0 && $x < $self->{w}
2075 && $y >= 0 && $y < $self->{h};
2076
2077 1
1848} 2078}
1849 2079
1850############################################################################# 2080#############################################################################
1851 2081
1852package CFClient::UI::CheckBox; 2082package CFClient::UI::CheckBox;
… …
1879 my ($self) = @_; 2109 my ($self) = @_;
1880 2110
1881 (6) x 2 2111 (6) x 2
1882} 2112}
1883 2113
2114sub toggle {
2115 my ($self) = @_;
2116
2117 $self->{state} = !$self->{state};
2118 $self->emit (changed => $self->{state});
2119 $self->update;
2120}
2121
1884sub button_down { 2122sub invoke_button_down {
1885 my ($self, $ev, $x, $y) = @_; 2123 my ($self, $ev, $x, $y) = @_;
1886 2124
1887 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x} 2125 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1888 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) { 2126 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1889 $self->{state} = !$self->{state}; 2127 $self->toggle;
1890 $self->_emit (changed => $self->{state}); 2128 } else {
2129 return 0
2130 }
2131
1891 } 2132 1
1892} 2133}
1893 2134
1894sub _draw { 2135sub _draw {
1895 my ($self) = @_; 2136 my ($self) = @_;
1896 2137
… …
1916package CFClient::UI::Image; 2157package CFClient::UI::Image;
1917 2158
1918our @ISA = CFClient::UI::Base::; 2159our @ISA = CFClient::UI::Base::;
1919 2160
1920use CFClient::OpenGL; 2161use CFClient::OpenGL;
1921use Carp qw/confess/;
1922 2162
1923our %loaded_images; 2163our %texture_cache;
1924 2164
1925sub new { 2165sub new {
1926 my $class = shift; 2166 my $class = shift;
1927 2167
1928 my $self = $class->SUPER::new (can_events => 0, @_); 2168 my $self = $class->SUPER::new (
2169 can_events => 0,
2170 @_,
2171 );
1929 2172
1930 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2173 $self->{path} || $self->{tex}
2174 or Carp::croak "'path' or 'tex' attributes required";
1931 2175
1932 $loaded_images{$self->{image}} ||= 2176 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1933 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2177 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1934 2178
1935 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2179 Scalar::Util::weaken $texture_cache{$self->{path}};
1936 2180
1937 Scalar::Util::weaken $loaded_images{$self->{image}}; 2181 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1938
1939 $self->{aspect} = $tex->{w} / $tex->{h};
1940 2182
1941 $self 2183 $self
1942} 2184}
1943 2185
1944sub size_request { 2186sub size_request {
1945 my ($self) = @_; 2187 my ($self) = @_;
1946 2188
1947 ($self->{tex}->{w}, $self->{tex}->{h}) 2189 ($self->{tex}{w}, $self->{tex}{h})
1948} 2190}
1949 2191
1950sub _draw { 2192sub _draw {
1951 my ($self) = @_; 2193 my ($self) = @_;
1952 2194
… …
2061 my $ycut1 = max 0, min 1, $ycut; 2303 my $ycut1 = max 0, min 1, $ycut;
2062 my $ycut2 = max 0, min 1, $ycut - 1; 2304 my $ycut2 = max 0, min 1, $ycut - 1;
2063 2305
2064 my $h1 = $self->{h} * (1 - $ycut1); 2306 my $h1 = $self->{h} * (1 - $ycut1);
2065 my $h2 = $self->{h} * (1 - $ycut2); 2307 my $h2 = $self->{h} * (1 - $ycut2);
2308 my $h3 = $self->{h};
2309
2310 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
2066 2311
2067 glEnable GL_BLEND; 2312 glEnable GL_BLEND;
2068 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2313 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2314 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2069 glEnable GL_TEXTURE_2D; 2315 glEnable GL_TEXTURE_2D;
2070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2316 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2071 2317
2072 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2318 glBindTexture GL_TEXTURE_2D, $t1->{name};
2073 glBegin GL_QUADS; 2319 glBegin GL_QUADS;
… …
2088 2334
2089 if ($t3) { 2335 if ($t3) {
2090 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2336 glBindTexture GL_TEXTURE_2D, $t3->{name};
2091 glBegin GL_QUADS; 2337 glBegin GL_QUADS;
2092 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2338 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2093 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2339 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2094 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2340 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2095 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2341 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2096 glEnd; 2342 glEnd;
2097 } 2343 }
2098 2344
2099 glDisable GL_BLEND; 2345 glDisable GL_BLEND;
… …
2187 $self->update; 2433 $self->update;
2188 2434
2189 $self 2435 $self
2190} 2436}
2191 2437
2192sub changed { }
2193
2194sub set_range { 2438sub set_range {
2195 my ($self, $range) = @_; 2439 my ($self, $range) = @_;
2196 2440
2197 ($range, $self->{range}) = ($self->{range}, $range); 2441 ($range, $self->{range}) = ($self->{range}, $range);
2198 2442
2199 $self->update
2200 if "@$range" ne "@{$self->{range}}"; 2443 if ("@$range" ne "@{$self->{range}}") {
2444 $self->update;
2445 $self->set_value ($self->{range}[0]);
2446 }
2201} 2447}
2202 2448
2203sub set_value { 2449sub set_value {
2204 my ($self, $value) = @_; 2450 my ($self, $value) = @_;
2205 2451
… …
2216 if $unit; 2462 if $unit;
2217 2463
2218 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2464 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2219 2465
2220 if ($value != $old_value) { 2466 if ($value != $old_value) {
2221 $self->_emit (changed => $value); 2467 $self->emit (changed => $value);
2222 $self->update; 2468 $self->update;
2223 } 2469 }
2224} 2470}
2225 2471
2226sub size_request { 2472sub size_request {
2227 my ($self) = @_; 2473 my ($self) = @_;
2228 2474
2229 ($self->{req_w}, $self->{req_h}) 2475 ($self->{req_w}, $self->{req_h})
2230} 2476}
2231 2477
2232sub button_down { 2478sub invoke_button_down {
2233 my ($self, $ev, $x, $y) = @_; 2479 my ($self, $ev, $x, $y) = @_;
2234 2480
2235 $self->SUPER::button_down ($ev, $x, $y); 2481 $self->SUPER::invoke_button_down ($ev, $x, $y);
2236 2482
2237 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2483 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2238 2484
2239 $self->mouse_motion ($ev, $x, $y); 2485 $self->invoke_mouse_motion ($ev, $x, $y)
2240} 2486}
2241 2487
2242sub mouse_motion { 2488sub invoke_mouse_motion {
2243 my ($self, $ev, $x, $y) = @_; 2489 my ($self, $ev, $x, $y) = @_;
2244 2490
2245 if ($GRAB == $self) { 2491 if ($GRAB == $self) {
2246 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2492 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2247 2493
2248 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2494 my (undef, $lo, $hi, $page) = @{$self->{range}};
2249 2495
2250 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2496 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2251 2497
2252 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2498 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2499 } else {
2500 return 0;
2501 }
2502
2253 } 2503 1
2504}
2505
2506sub invoke_mouse_wheel {
2507 my ($self, $ev) = @_;
2508
2509 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510
2511 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);
2512
2513 ! ! $delta
2254} 2514}
2255 2515
2256sub update { 2516sub update {
2257 my ($self) = @_; 2517 my ($self) = @_;
2258 2518
2259 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2519 delete $self->{knob_w};
2520 $self->SUPER::update;
2521}
2522
2523sub _draw {
2524 my ($self) = @_;
2525
2526 unless ($self->{knob_w}) {
2260 $self->set_value ($self->{range}[0]); 2527 $self->set_value ($self->{range}[0]);
2261 2528
2262 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2529 my ($value, $lo, $hi, $page) = @{$self->{range}};
2263 my $range = ($hi - $page - $lo) || 1e-100; 2530 my $range = ($hi - $page - $lo) || 1e-100;
2264 2531
… …
2270 $value = ($value - $lo) / $range; 2537 $value = ($value - $lo) / $range;
2271 $value = $value * $self->{scale} + $self->{offset}; 2538 $value = $value * $self->{scale} + $self->{offset};
2272 2539
2273 $self->{knob_x} = $value - $knob_w * 0.5; 2540 $self->{knob_x} = $value - $knob_w * 0.5;
2274 $self->{knob_w} = $knob_w; 2541 $self->{knob_w} = $knob_w;
2275 }); 2542 }
2276
2277 $self->SUPER::update;
2278}
2279
2280sub _draw {
2281 my ($self) = @_;
2282 2543
2283 $self->SUPER::_draw (); 2544 $self->SUPER::_draw ();
2284 2545
2285 glScale $self->{w}, $self->{h}; 2546 glScale $self->{w}, $self->{h};
2286 2547
… …
2347sub set_range { shift->{slider}->set_range (@_) } 2608sub set_range { shift->{slider}->set_range (@_) }
2348sub set_value { shift->{slider}->set_value (@_) } 2609sub set_value { shift->{slider}->set_value (@_) }
2349 2610
2350############################################################################# 2611#############################################################################
2351 2612
2352package CFClient::UI::TextView; 2613package CFClient::UI::TextScroller;
2353 2614
2354our @ISA = CFClient::UI::HBox::; 2615our @ISA = CFClient::UI::HBox::;
2355 2616
2356use CFClient::OpenGL; 2617use CFClient::OpenGL;
2357 2618
2358sub new { 2619sub new {
2359 my $class = shift; 2620 my $class = shift;
2360 2621
2361 my $self = $class->SUPER::new ( 2622 my $self = $class->SUPER::new (
2362 fontsize => 1, 2623 fontsize => 1,
2363 can_events => 0, 2624 can_events => 1,
2625 indent => 0,
2364 #font => default_font 2626 #font => default_font
2365 @_, 2627 @_,
2366 2628
2367 layout => (new CFClient::Layout 1), 2629 layout => (new CFClient::Layout),
2368 par => [], 2630 par => [],
2369 height => 0, 2631 height => 0,
2370 children => [ 2632 children => [
2371 (new CFClient::UI::Empty expand => 1), 2633 (new CFClient::UI::Empty expand => 1),
2372 (new CFClient::UI::Slider vertical => 1), 2634 (new CFClient::UI::Slider vertical => 1),
… …
2383 2645
2384 $self->{fontsize} = $fontsize; 2646 $self->{fontsize} = $fontsize;
2385 $self->reflow; 2647 $self->reflow;
2386} 2648}
2387 2649
2650sub size_request {
2651 my ($self) = @_;
2652
2653 my ($empty, $slider) = @{ $self->{children} };
2654
2655 local $self->{children} = [$empty, $slider];
2656 $self->SUPER::size_request
2657}
2658
2388sub size_allocate { 2659sub invoke_size_allocate {
2389 my ($self, $w, $h) = @_; 2660 my ($self, $w, $h) = @_;
2390 2661
2391 $self->SUPER::size_allocate ($w, $h); 2662 my ($empty, $slider, @other) = @{ $self->{children} };
2663 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2392 2664
2393 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2665 $self->{layout}->set_font ($self->{font}) if $self->{font};
2394 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2666 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2395 $self->{layout}->set_width ($self->{children}[0]{w}); 2667 $self->{layout}->set_width ($empty->{w});
2668 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2396 2669
2397 $self->reflow; 2670 $self->reflow;
2398}
2399 2671
2400sub text_size { 2672 local $self->{children} = [$empty, $slider];
2673 $self->SUPER::invoke_size_allocate ($w, $h)
2674}
2675
2676sub invoke_mouse_wheel {
2401 my ($self, $text, $indent) = @_; 2677 my ($self, $ev) = @_;
2678
2679 return 0 unless $ev->{dy}; # only vertical movements
2680
2681 $self->{children}[1]->emit (mouse_wheel => $ev);
2682
2683 1
2684}
2685
2686sub get_layout {
2687 my ($self, $para) = @_;
2402 2688
2403 my $layout = $self->{layout}; 2689 my $layout = $self->{layout};
2404 2690
2691 $layout->set_font ($self->{font}) if $self->{font};
2692 $layout->set_foreground (@{$para->{fg}});
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2693 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406 $layout->set_width ($self->{children}[0]{w} - $indent); 2694 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2695 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2407 $layout->set_markup ($text); 2696 $layout->set_markup ($para->{markup});
2697
2698 $layout->set_shapes (
2699 map
2700 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2701 @{$para->{widget}}
2408 2702 );
2703
2409 $layout->size 2704 $layout
2410} 2705}
2411 2706
2412sub reflow { 2707sub reflow {
2413 my ($self) = @_; 2708 my ($self) = @_;
2414 2709
… …
2423 $self->{children}[1]->set_value ($offset); 2718 $self->{children}[1]->set_value ($offset);
2424} 2719}
2425 2720
2426sub clear { 2721sub clear {
2427 my ($self) = @_; 2722 my ($self) = @_;
2723
2724 my (undef, undef, @other) = @{ $self->{children} };
2725 $self->remove ($_) for @other;
2428 2726
2429 $self->{par} = []; 2727 $self->{par} = [];
2430 $self->{height} = 0; 2728 $self->{height} = 0;
2431 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2729 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2432} 2730}
2433 2731
2434sub add_paragraph { 2732sub add_paragraph {
2435 my ($self, $color, $text, $indent) = @_; 2733 my ($self, $color, $para, $indent) = @_;
2436 2734
2437 for my $line (split /\n/, $text) { 2735 my ($text, @w) = ref $para ? @$para : $para;
2438 my ($w, $h) = $self->text_size ($line); 2736
2439 $self->{height} += $h; 2737 $para = {
2440 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2738 w => 1e10,
2739 wrapped => 1,
2740 fg => $color,
2741 indent => $indent,
2742 markup => $text,
2743 widget => \@w,
2441 } 2744 };
2442 2745
2443 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2746 $self->add (@w) if @w;
2747 push @{$self->{par}}, $para;
2748
2749 $self->{need_reflow}++;
2750 $self->update;
2751}
2752
2753sub scroll_to_bottom {
2754 my ($self) = @_;
2755
2756 $self->{scroll_to_bottom} = 1;
2757 $self->update;
2444} 2758}
2445 2759
2446sub update { 2760sub update {
2447 my ($self) = @_; 2761 my ($self) = @_;
2448 2762
… …
2450 2764
2451 return unless $self->{h} > 0; 2765 return unless $self->{h} > 0;
2452 2766
2453 delete $self->{texture}; 2767 delete $self->{texture};
2454 2768
2455 $ROOT->on_post_alloc ($self, sub { 2769 $ROOT->on_post_alloc ($self => sub {
2456 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2770 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2457 2771
2458 if (delete $self->{need_reflow}) { 2772 if (delete $self->{need_reflow}) {
2459 my $height = 0; 2773 my $height = 0;
2460 2774
2461 my $layout = $self->{layout};
2462
2463 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2464
2465 for (@{$self->{par}}) { 2775 for my $para (@{$self->{par}}) {
2466 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2776 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2467 $layout->set_width ($W - $_->[3]); 2777 my $layout = $self->get_layout ($para);
2468 $layout->set_markup ($_->[4]);
2469 my ($w, $h) = $layout->size; 2778 my ($w, $h) = $layout->size;
2470 $_->[0] = $w + $_->[3]; 2779
2471 $_->[1] = $h; 2780 $para->{w} = $w + $para->{indent};
2781 $para->{h} = $h;
2782 $para->{wrapped} = $layout->has_wrapped;
2472 } 2783 }
2473 2784
2474 $height += $_->[1]; 2785 $height += $para->{h};
2475 } 2786 }
2476 2787
2477 $self->{height} = $height; 2788 $self->{height} = $height;
2478 2789
2479 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2790 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2480 2791
2481 delete $self->{texture}; 2792 delete $self->{texture};
2482 } 2793 }
2483 2794
2795 if (delete $self->{scroll_to_bottom}) {
2796 $self->{children}[1]->set_value (1e10);
2797 }
2798
2484 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2799 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2485 glClearColor 0.5, 0.5, 0.5, 0; 2800 glClearColor 0, 0, 0, 0;
2486 glClear GL_COLOR_BUFFER_BIT; 2801 glClear GL_COLOR_BUFFER_BIT;
2487 2802
2488 my $top = int $self->{children}[1]{range}[0]; 2803 my $top = int $self->{children}[1]{range}[0];
2489 2804
2490 my $y0 = $top; 2805 my $y0 = $top;
2491 my $y1 = $top + $H; 2806 my $y1 = $top + $H;
2492 2807
2493 my $y = 0; 2808 my $y = 0;
2494 2809
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}}) { 2810 for my $para (@{$self->{par}}) {
2504 my $h = $par->[1]; 2811 my $h = $para->{h};
2505 2812
2506 if ($y0 < $y + $h && $y < $y1) { 2813 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 2814
2511 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2815 my $layout = $self->get_layout ($para);
2512 2816
2513 glRasterPos $par->[3], $y - $y0; 2817 $layout->render ($para->{indent}, $y - $y0);
2514 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2818
2819 if (my @w = @{ $para->{widget} }) {
2820 my @s = $layout->get_shapes;
2821
2822 for (@w) {
2823 my ($dx, $dy) = splice @s, 0, 2, ();
2824
2825 $_->{x} = $dx + $para->{indent};
2826 $_->{y} = $dy + $y - $y0;
2827
2828 $_->draw;
2829 }
2830 }
2515 } 2831 }
2516 2832
2517 $y += $h; 2833 $y += $h;
2518 } 2834 }
2519
2520 glDisable GL_BLEND;
2521 }; 2835 };
2522 }); 2836 });
2523} 2837}
2524 2838
2839sub reconfigure {
2840 my ($self) = @_;
2841
2842 $self->SUPER::reconfigure;
2843
2844 $_->{w} = 1e10 for @{ $self->{par} };
2845 $self->reflow;
2846}
2847
2525sub _draw { 2848sub _draw {
2526 my ($self) = @_; 2849 my ($self) = @_;
2527 2850
2528 glEnable GL_TEXTURE_2D; 2851 glEnable GL_TEXTURE_2D;
2529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2852 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2530 glColor 1, 1, 1, 1; 2853 glColor 0, 0, 0, 1;
2531 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2854 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2532 glDisable GL_TEXTURE_2D; 2855 glDisable GL_TEXTURE_2D;
2533 2856
2534 $self->{children}[1]->draw; 2857 $self->{children}[1]->draw;
2535
2536} 2858}
2537 2859
2538############################################################################# 2860#############################################################################
2539 2861
2540package CFClient::UI::Animator; 2862package CFClient::UI::Animator;
… …
2627 $tooltip .= "\n\n" . (ref $widget) . "\n" 2949 $tooltip .= "\n\n" . (ref $widget) . "\n"
2628 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n" 2950 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2629 . "req $widget->{req_w} $widget->{req_h}\n" 2951 . "req $widget->{req_w} $widget->{req_h}\n"
2630 . "visible $widget->{visible}"; 2952 . "visible $widget->{visible}";
2631 } 2953 }
2954
2955 $tooltip =~ s/^\n+//;
2956 $tooltip =~ s/\n+$//;
2632 2957
2633 $self->add (new CFClient::UI::Label 2958 $self->add (new CFClient::UI::Label
2634 markup => $tooltip, 2959 markup => $tooltip,
2635 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2960 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2636 fontsize => 0.8, 2961 fontsize => 0.8,
… …
2646 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2971 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2647 2972
2648 ($w + 4, $h + 4) 2973 ($w + 4, $h + 4)
2649} 2974}
2650 2975
2651sub size_allocate { 2976sub invoke_size_allocate {
2652 my ($self, $w, $h) = @_; 2977 my ($self, $w, $h) = @_;
2653 2978
2654 $self->SUPER::size_allocate ($w - 4, $h - 4); 2979 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2655} 2980}
2656 2981
2657sub visibility_change { 2982sub invoke_visibility_change {
2658 my ($self, $visible) = @_; 2983 my ($self, $visible) = @_;
2659 2984
2660 return unless $visible; 2985 return unless $visible;
2661 2986
2662 $self->{root}->on_post_alloc ("move_$self" => sub { 2987 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2664 or return; 2989 or return;
2665 2990
2666 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2991 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2667 2992
2668 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2993 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2669 if $x + $self->{w} > $::WIDTH; 2994 if $x + $self->{w} > $self->{root}{w};
2670 2995
2671 $self->move_abs ($x, $y); 2996 $self->move_abs ($x, $y);
2672 }); 2997 });
2673} 2998}
2674 2999
… …
2763 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3088 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2764 3089
2765 if ($tex) { 3090 if ($tex) {
2766 glEnable GL_TEXTURE_2D; 3091 glEnable GL_TEXTURE_2D;
2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3092 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2768 glColor 1, 1, 1, 1; 3093 glColor 0, 0, 0, 1;
2769 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3094 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2770 glDisable GL_TEXTURE_2D; 3095 glDisable GL_TEXTURE_2D;
2771 } 3096 }
2772} 3097}
2773 3098
2774sub DESTROY { 3099sub destroy {
2775 my ($self) = @_; 3100 my ($self) = @_;
2776 3101
2777 $self->{timer}->cancel 3102 $self->{timer}->cancel
2778 if $self->{timer}; 3103 if $self->{timer};
2779 3104
2780 $self->SUPER::DESTROY; 3105 $self->SUPER::destroy;
2781} 3106}
2782 3107
2783############################################################################# 3108#############################################################################
2784 3109
2785package CFClient::UI::Inventory; 3110package CFClient::UI::Buttonbar;
2786 3111
2787our @ISA = CFClient::UI::ScrolledWindow::; 3112our @ISA = CFClient::UI::HBox::;
2788 3113
2789sub new { 3114# TODO: should actualyl wrap buttons and other goodies.
2790 my $class = shift;
2791
2792 my $self = $class->SUPER::new (
2793 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2794 @_,
2795 );
2796
2797 $self
2798}
2799
2800sub set_items {
2801 my ($self, $items) = @_;
2802
2803 $self->{scrolled}->clear;
2804 return unless $items;
2805
2806 my @items = sort {
2807 ($a->{type} <=> $b->{type})
2808 or ($a->{name} cmp $b->{name})
2809 } @$items;
2810
2811 $self->{real_items} = \@items;
2812
2813 my $row = 0;
2814 for my $item (@items) {
2815 CFClient::Item::update_widgets $item;
2816
2817 $self->{scrolled}->add (0, $row, $item->{face_widget});
2818 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2819 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2820
2821 $row++;
2822 }
2823}
2824 3115
2825############################################################################# 3116#############################################################################
2826 3117
2827package CFClient::UI::Menu; 3118package CFClient::UI::Menu;
2828 3119
… …
2840 ); 3131 );
2841 3132
2842 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3133 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2843 3134
2844 for my $item (@{ $self->{items} }) { 3135 for my $item (@{ $self->{items} }) {
2845 my ($widget, $cb) = @$item; 3136 my ($widget, $cb, $tooltip) = @$item;
2846 3137
2847 # handle various types of items, only text for now 3138 # handle various types of items, only text for now
2848 if (!ref $widget) { 3139 if (!ref $widget) {
3140 if ($widget =~ /\t/) {
3141 my ($left, $right) = split /\t/, $widget, 2;
3142
3143 $widget = new CFClient::UI::HBox
3144 can_hover => 1,
3145 can_events => 1,
3146 tooltip => $tooltip,
3147 children => [
3148 (new CFClient::UI::Label markup => $left, expand => 1),
3149 (new CFClient::UI::Label markup => $right, align => +1),
3150 ],
3151 ;
3152
3153 } else {
2849 $widget = new CFClient::UI::Label 3154 $widget = new CFClient::UI::Label
2850 can_hover => 1, 3155 can_hover => 1,
2851 can_events => 1, 3156 can_events => 1,
2852 text => $widget; 3157 markup => $widget,
3158 tooltip => $tooltip;
3159 }
2853 } 3160 }
2854 3161
2855 $self->{item}{$widget} = $item; 3162 $self->{item}{$widget} = $item;
2856 3163
2857 $self->{vbox}->add ($widget); 3164 $self->{vbox}->add ($widget);
… …
2862 3169
2863# popup given the event (must be a mouse button down event currently) 3170# popup given the event (must be a mouse button down event currently)
2864sub popup { 3171sub popup {
2865 my ($self, $ev) = @_; 3172 my ($self, $ev) = @_;
2866 3173
2867 $self->_emit ("popdown"); 3174 $self->emit ("popdown");
2868 3175
2869 # maybe save $GRAB? must be careful about events... 3176 # maybe save $GRAB? must be careful about events...
2870 $GRAB = $self; 3177 $GRAB = $self;
2871 $self->{button} = $ev->{button}; 3178 $self->{button} = $ev->{button};
2872 3179
2873 $self->show; 3180 $self->show;
2874 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3181 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2875} 3182}
2876 3183
2877sub mouse_motion { 3184sub invoke_mouse_motion {
2878 my ($self, $ev, $x, $y) = @_; 3185 my ($self, $ev, $x, $y) = @_;
2879 3186
2880 # TODO: should use vbox->find_widget or so 3187 # TODO: should use vbox->find_widget or so
2881 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3188 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2882 $self->{hover} = $self->{item}{$HOVER}; 3189 $self->{hover} = $self->{item}{$HOVER};
2883}
2884 3190
3191 0
3192}
3193
2885sub button_up { 3194sub invoke_button_up {
2886 my ($self, $ev, $x, $y) = @_; 3195 my ($self, $ev, $x, $y) = @_;
2887 3196
2888 if ($ev->{button} == $self->{button}) { 3197 if ($ev->{button} == $self->{button}) {
2889 undef $GRAB; 3198 undef $GRAB;
2890 $self->hide; 3199 $self->hide;
2891 3200
2892 $self->_emit ("popdown"); 3201 $self->emit ("popdown");
2893 $self->{hover}[1]->() if $self->{hover}; 3202 $self->{hover}[1]->() if $self->{hover};
3203 } else {
3204 return 0
3205 }
3206
2894 } 3207 1
2895} 3208}
2896 3209
2897############################################################################# 3210#############################################################################
2898 3211
2899package CFClient::UI::Statusbox; 3212package CFClient::UI::Multiplexer;
2900 3213
2901our @ISA = CFClient::UI::VBox::; 3214our @ISA = CFClient::UI::Container::;
2902 3215
2903sub new { 3216sub new {
2904 my $class = shift; 3217 my $class = shift;
2905 3218
2906 $class->SUPER::new ( 3219 my $self = $class->SUPER::new (
3220 @_,
3221 );
3222
3223 $self->{current} = $self->{children}[0]
3224 if @{ $self->{children} };
3225
3226 $self
3227}
3228
3229sub add {
3230 my ($self, @widgets) = @_;
3231
3232 $self->SUPER::add (@widgets);
3233
3234 $self->{current} = $self->{children}[0]
3235 if @{ $self->{children} };
3236}
3237
3238sub get_current_page {
3239 my ($self) = @_;
3240
3241 $self->{current}
3242}
3243
3244sub set_current_page {
3245 my ($self, $page_or_widget) = @_;
3246
3247 my $widget = ref $page_or_widget
3248 ? $page_or_widget
3249 : $self->{children}[$page_or_widget];
3250
3251 $self->{current} = $widget;
3252 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3253
3254 $self->emit (page_changed => $self->{current});
3255
3256 $self->realloc;
3257}
3258
3259sub visible_children {
3260 $_[0]{current}
3261}
3262
3263sub size_request {
3264 my ($self) = @_;
3265
3266 $self->{current}->size_request
3267}
3268
3269sub invoke_size_allocate {
3270 my ($self, $w, $h) = @_;
3271
3272 $self->{current}->configure (0, 0, $w, $h);
3273
3274 1
3275}
3276
3277sub _draw {
3278 my ($self) = @_;
3279
3280 $self->{current}->draw;
3281}
3282
3283#############################################################################
3284
3285package CFClient::UI::Notebook;
3286
3287our @ISA = CFClient::UI::VBox::;
3288
3289sub new {
3290 my $class = shift;
3291
3292 my $self = $class->SUPER::new (
3293 buttonbar => (new CFClient::UI::Buttonbar),
3294 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3295 # filter => # will be put between multiplexer and $self
3296 @_,
3297 );
3298
3299 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3300 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3301
3302 $self
3303}
3304
3305sub add {
3306 my ($self, $title, $widget, $tooltip) = @_;
3307
3308 Scalar::Util::weaken $self;
3309
3310 $self->{buttonbar}->add (new CFClient::UI::Button
3311 markup => $title,
3312 tooltip => $tooltip,
3313 on_activate => sub { $self->set_current_page ($widget) },
3314 );
3315
3316 $self->{multiplexer}->add ($widget);
3317}
3318
3319sub get_current_page {
3320 my ($self) = @_;
3321
3322 $self->{multiplexer}->get_current_page
3323}
3324
3325sub set_current_page {
3326 my ($self, $page) = @_;
3327
3328 $self->{multiplexer}->set_current_page ($page);
3329 $self->emit (page_changed => $self->{multiplexer}{current});
3330}
3331
3332#############################################################################
3333
3334package CFClient::UI::Combobox;
3335
3336use utf8;
3337
3338our @ISA = CFClient::UI::Button::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (
3344 options => [], # [value, title, longdesc], ...
3345 value => undef,
3346 @_,
3347 );
3348
3349 $self->_set_value ($self->{value});
3350
3351 $self
3352}
3353
3354sub invoke_button_down {
3355 my ($self, $ev) = @_;
3356
3357 my @menu_items;
3358
3359 for (@{ $self->{options} }) {
3360 my ($value, $title, $tooltip) = @$_;
3361
3362 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363 }
3364
3365 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366}
3367
3368sub _set_value {
3369 my ($self, $value) = @_;
3370
3371 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3372 or return;
3373
3374 $self->{value} = $item->[0];
3375 $self->set_markup ("$item->[1] ⇓");
3376 $self->set_tooltip ($item->[2]);
3377}
3378
3379sub set_value {
3380 my ($self, $value) = @_;
3381
3382 return unless $self->{value} ne $value;
3383
3384 $self->_set_value ($value);
3385 $self->emit (changed => $value);
3386}
3387
3388#############################################################################
3389
3390package CFClient::UI::Statusbox;
3391
3392our @ISA = CFClient::UI::VBox::;
3393
3394sub new {
3395 my $class = shift;
3396
3397 my $self = $class->SUPER::new (
2907 fontsize => 0.8, 3398 fontsize => 0.8,
2908 @_, 3399 @_,
2909 ) 3400 );
3401
3402 Scalar::Util::weaken (my $this = $self);
3403
3404 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405
3406 $self
2910} 3407}
2911 3408
2912sub reorder { 3409sub reorder {
2913 my ($self) = @_; 3410 my ($self) = @_;
2914 my $NOW = time; 3411 my $NOW = Time::HiRes::time;
3412
3413 # freeze display when hovering over any label
3414 return if $CFClient::UI::TOOLTIP->{owner}
3415 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3416 values %{ $self->{item} };
2915 3417
2916 while (my ($k, $v) = each %{ $self->{item} }) { 3418 while (my ($k, $v) = each %{ $self->{item} }) {
2917 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3419 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2918 } 3420 }
2919 3421
… …
2922 my @items = sort { 3424 my @items = sort {
2923 $a->{pri} <=> $b->{pri} 3425 $a->{pri} <=> $b->{pri}
2924 or $b->{id} <=> $a->{id} 3426 or $b->{id} <=> $a->{id}
2925 } values %{ $self->{item} }; 3427 } values %{ $self->{item} };
2926 3428
3429 $self->{timer}->interval (1);
3430
2927 my $count = 10 + 1; 3431 my $count = 10 + 1;
2928 for my $item (@items) { 3432 for my $item (@items) {
2929 last unless --$count; 3433 last unless --$count;
2930 3434
2931 push @widgets, $item->{label} ||= do { 3435 my $label = $item->{label} ||= do {
2932 # TODO: doesn't handle markup well (read as: at all) 3436 # TODO: doesn't handle markup well (read as: at all)
2933 my $short = $item->{count} > 1 3437 my $short = $item->{count} > 1
2934 ? "<b>$item->{count} ×</b> $item->{text}" 3438 ? "<b>$item->{count} ×</b> $item->{text}"
2935 : $item->{text}; 3439 : $item->{text};
2936 3440
… …
2944 tooltip => $item->{tooltip}, 3448 tooltip => $item->{tooltip},
2945 tooltip_font => $::FONT_PROP, 3449 tooltip_font => $::FONT_PROP,
2946 tooltip_width => 0.67, 3450 tooltip_width => 0.67,
2947 fontsize => $item->{fontsize} || $self->{fontsize}, 3451 fontsize => $item->{fontsize} || $self->{fontsize},
2948 max_w => $::WIDTH * 0.44, 3452 max_w => $::WIDTH * 0.44,
2949 fg => $item->{fg}, 3453 fg => [@{ $item->{fg} }],
2950 can_events => 1, 3454 can_events => 1,
2951 can_hover => 1 3455 can_hover => 1
2952 }; 3456 };
3457
3458 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3459 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3460 $label->update;
3461 $label->set_max_size (undef, $label->{req_h} * $diff)
3462 if $diff < 1;
3463 $self->{timer}->interval (1/30);
3464 } else {
3465 $label->{fg}[3] = $item->{fg}[3] || 1;
3466 }
3467
3468 push @widgets, $label;
2953 } 3469 }
2954 3470
2955 $self->clear; 3471 $self->clear;
2956 $self->SUPER::add (reverse @widgets); 3472 $self->SUPER::add (reverse @widgets);
2957} 3473}
… …
2962 $text =~ s/^\s+//; 3478 $text =~ s/^\s+//;
2963 $text =~ s/\s+$//; 3479 $text =~ s/\s+$//;
2964 3480
2965 return unless $text; 3481 return unless $text;
2966 3482
2967 my $timeout = time + ((delete $arg{timeout}) || 60); 3483 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2968 3484
2969 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3485 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2970 3486
2971 if (my $item = $self->{item}{$group}) { 3487 if (my $item = $self->{item}{$group}) {
2972 if ($item->{text} eq $text) { 3488 if ($item->{text} eq $text) {
2973 $item->{count}++; 3489 $item->{count}++;
2974 } else { 3490 } else {
2975 $item->{count} = 1; 3491 $item->{count} = 1;
2976 $item->{text} = $item->{tooltip} = $text; 3492 $item->{text} = $item->{tooltip} = $text;
2977 } 3493 }
2978 $item->{id} = ++$self->{id}; 3494 $item->{id} += 0.2;#d#
2979 $item->{timeout} = $timeout; 3495 $item->{timeout} = $timeout;
2980 delete $item->{label}; 3496 delete $item->{label};
2981 } else { 3497 } else {
2982 $self->{item}{$group} = { 3498 $self->{item}{$group} = {
2983 id => ++$self->{id}, 3499 id => ++$self->{id},
… …
2989 count => 1, 3505 count => 1,
2990 %arg, 3506 %arg,
2991 }; 3507 };
2992 } 3508 }
2993 3509
3510 $ROOT->on_refresh (reorder => sub {
2994 $self->reorder; 3511 $self->reorder;
3512 });
2995} 3513}
2996 3514
2997sub reconfigure { 3515sub reconfigure {
2998 my ($self) = @_; 3516 my ($self) = @_;
2999 3517
… …
3002 3520
3003 $self->reorder; 3521 $self->reorder;
3004 $self->SUPER::reconfigure; 3522 $self->SUPER::reconfigure;
3005} 3523}
3006 3524
3525sub destroy {
3526 my ($self) = @_;
3527
3528 $self->{timer}->cancel;
3529
3530 $self->SUPER::destroy;
3531}
3532
3007############################################################################# 3533#############################################################################
3008 3534
3535package CFClient::UI::Inventory;
3536
3537our @ISA = CFClient::UI::Table::;
3538
3539sub new {
3540 my $class = shift;
3541
3542 my $self = $class->SUPER::new (
3543 col_expand => [0, 1, 0],
3544 @_,
3545 );
3546
3547 $self
3548}
3549
3550sub set_items {
3551 my ($self, $items) = @_;
3552
3553 $self->clear;
3554 return unless $items;
3555
3556 my @items = sort {
3557 ($a->{type} <=> $b->{type})
3558 or ($a->{name} cmp $b->{name})
3559 } values %$items;
3560
3561 $self->{real_items} = \@items;
3562
3563 my $row = 0;
3564 for my $item (@items) {
3565 CFClient::Item::update_widgets $item;
3566
3567 $self->add (0, $row, $item->{face_widget});
3568 $self->add (1, $row, $item->{desc_widget});
3569 $self->add (2, $row, $item->{weight_widget});
3570
3571 $row++;
3572 }
3573}
3574
3575#############################################################################
3576
3577package CFClient::UI::SpellList;
3578
3579our @ISA = CFClient::UI::Table::;
3580
3581sub new {
3582 my $class = shift;
3583
3584 my $self = $class->SUPER::new (
3585 binding => [],
3586 commands => [],
3587 @_,
3588 )
3589}
3590
3591my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604sub rebuild_spell_list {
3605 my ($self) = @_;
3606
3607 $CFClient::UI::ROOT->on_refresh ($self => sub {
3608 $self->clear;
3609
3610 return unless $::CONN;
3611
3612 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618 my $row = 0;
3619
3620 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621 my $spell = $self->{spell}{$_};
3622
3623 $row++;
3624
3625 my $spell_cb = sub {
3626 my ($widget, $ev) = @_;
3627
3628 if ($ev->{button} == 1) {
3629 $::CONN->user_send ("cast $spell->{name}");
3630 } elsif ($ev->{button} == 2) {
3631 $::CONN->user_send ("invoke $spell->{name}");
3632 } elsif ($ev->{button} == 3) {
3633 (new CFClient::UI::Menu
3634 items => [
3635 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637 ],
3638 )->popup ($ev);
3639 } else {
3640 return 0;
3641 }
3642
3643 1
3644 };
3645
3646 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648 #TODO: add path info to tooltip
3649 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651 $self->add (0, $row, new CFClient::UI::Face
3652 face => $spell->{face},
3653 can_hover => 1,
3654 can_events => 1,
3655 tooltip => $tooltip,
3656 on_button_down => $spell_cb,
3657 );
3658
3659 $self->add (1, $row, new CFClient::UI::Label
3660 expand => 1,
3661 text => $spell->{name},
3662 can_hover => 1,
3663 can_events => 1,
3664 tooltip => $tooltip,
3665 on_button_down => $spell_cb,
3666 );
3667
3668 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672 }
3673 });
3674}
3675
3676sub add_spell {
3677 my ($self, $spell) = @_;
3678
3679 $self->{spell}->{$spell->{name}} = $spell;
3680 $self->rebuild_spell_list;
3681}
3682
3683sub remove_spell {
3684 my ($self, $spell) = @_;
3685
3686 delete $self->{spell}->{$spell->{name}};
3687 $self->rebuild_spell_list;
3688}
3689
3690sub clear_spells {
3691 my ($self) = @_;
3692
3693 $self->{spell} = {};
3694 $self->rebuild_spell_list;
3695}
3696
3697#############################################################################
3698
3009package CFClient::UI::Root; 3699package CFClient::UI::Root;
3010 3700
3011our @ISA = CFClient::UI::Container::; 3701our @ISA = CFClient::UI::Container::;
3702
3703use List::Util qw(min max);
3012 3704
3013use CFClient::OpenGL; 3705use CFClient::OpenGL;
3014 3706
3015sub new { 3707sub new {
3016 my $class = shift; 3708 my $class = shift;
… …
3043 $coord = $max - $size if $coord > $max - $size; 3735 $coord = $max - $size if $coord > $max - $size;
3044 3736
3045 int $coord + 0.5 3737 int $coord + 0.5
3046} 3738}
3047 3739
3048sub size_allocate { 3740sub invoke_size_allocate {
3049 my ($self, $w, $h) = @_; 3741 my ($self, $w, $h) = @_;
3050 3742
3051 for my $child ($self->children) { 3743 for my $child ($self->children) {
3052 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3744 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3053 3745
… …
3057 $X = _to_pixel $X, $W, $self->{w}; 3749 $X = _to_pixel $X, $W, $self->{w};
3058 $Y = _to_pixel $Y, $H, $self->{h}; 3750 $Y = _to_pixel $Y, $H, $self->{h};
3059 3751
3060 $child->configure ($X, $Y, $W, $H); 3752 $child->configure ($X, $Y, $W, $H);
3061 } 3753 }
3754
3755 1
3062} 3756}
3063 3757
3064sub coord2local { 3758sub coord2local {
3065 my ($self, $x, $y) = @_; 3759 my ($self, $x, $y) = @_;
3066 3760
… …
3122 $_->() 3816 $_->()
3123 for values %{delete $self->{refresh_hook}}; 3817 for values %{delete $self->{refresh_hook}};
3124 } 3818 }
3125 3819
3126 if ($self->{realloc}) { 3820 if ($self->{realloc}) {
3821 my %queue;
3127 my @queue; 3822 my @queue;
3823 my $widget;
3128 3824
3825 outer:
3129 while () { 3826 while () {
3130 if ($self->{realloc}) { 3827 if (my $realloc = delete $self->{realloc}) {
3131 #TODO use array-of-depth approach 3828 for $widget (values %$realloc) {
3829 $widget->{visible} or next; # do not resize invisible widgets
3132 3830
3133 use sort 'stable'; 3831 $queue{$widget+0}++ and next; # duplicates are common
3134 3832
3135 @queue = sort { $a->{visible} <=> $b->{visible} } 3833 push @{ $queue[$widget->{visible}] }, $widget;
3136 @queue, values %{delete $self->{realloc}}; 3834 }
3137 } 3835 }
3138 3836
3837 while () {
3838 @queue or last outer;
3839
3139 my $widget = pop @queue || last; 3840 $widget = pop @{ $queue[-1] || [] }
3841 and last;
3842
3843 pop @queue;
3844 }
3140 3845
3141 $widget->{visible} or last; # do not resize invisible widgets 3846 delete $queue{$widget+0};
3142 3847
3143 my ($w, $h) = $widget->size_request; 3848 my ($w, $h) = $widget->size_request;
3144 3849
3145 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2; 3850 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3146 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2; 3851 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3852
3853 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3854 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3147 3855
3148 $w = $widget->{force_w} if exists $widget->{force_w}; 3856 $w = $widget->{force_w} if exists $widget->{force_w};
3149 $h = $widget->{force_h} if exists $widget->{force_h}; 3857 $h = $widget->{force_h} if exists $widget->{force_h};
3150 3858
3151 if ($widget->{req_w} != $w || $widget->{req_h} != $h 3859 if ($widget->{req_w} != $w || $widget->{req_h} != $h
… …
3154 $widget->{req_h} = $h; 3862 $widget->{req_h} = $h;
3155 3863
3156 $self->{size_alloc}{$widget+0} = $widget; 3864 $self->{size_alloc}{$widget+0} = $widget;
3157 3865
3158 if (my $parent = $widget->{parent}) { 3866 if (my $parent = $widget->{parent}) {
3159 $self->{realloc}{$parent+0} = $parent; 3867 $self->{realloc}{$parent+0} = $parent
3160 #unshift @queue, $parent; 3868 unless $queue{$parent+0};
3869
3161 $parent->{force_size_alloc} = 1; 3870 $parent->{force_size_alloc} = 1;
3162 $self->{size_alloc}{$parent+0} = $parent; 3871 $self->{size_alloc}{$parent+0} = $parent;
3163 } 3872 }
3164 } 3873 }
3165 3874
… …
3177 my ($w, $h) = @$widget{qw(alloc_w alloc_h)}; 3886 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3178 3887
3179 $w = 0 if $w < 0; 3888 $w = 0 if $w < 0;
3180 $h = 0 if $h < 0; 3889 $h = 0 if $h < 0;
3181 3890
3891 $w = max $widget->{min_w}, $w;
3892 $h = max $widget->{min_h}, $h;
3893
3894 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896
3182 $w = int $w + 0.5; 3897 $w = int $w + 0.5;
3183 $h = int $h + 0.5; 3898 $h = int $h + 0.5;
3184 3899
3185 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) { 3900 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3901 $widget->{old_w} = $widget->{w};
3902 $widget->{old_h} = $widget->{h};
3903
3186 $widget->{w} = $w; 3904 $widget->{w} = $w;
3187 $widget->{h} = $h; 3905 $widget->{h} = $h;
3188 3906
3189 $widget->emit (size_allocate => $w, $h); 3907 $widget->emit (size_allocate => $w, $h);
3190 } 3908 }
… …
3205 glLoadIdentity; 3923 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3924 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3925 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3926 glLoadIdentity;
3209 3927
3928 {
3929 package CFClient::UI::Base;
3930
3931 ($draw_x, $draw_y, $draw_w, $draw_h) =
3932 (0, 0, $self->{w}, $self->{h});
3933 }
3934
3210 $self->_draw; 3935 $self->_draw;
3211} 3936}
3212
3213#############################################################################
3214
3215package CFClient::UI::BindEditor;
3216
3217our @ISA = CFClient::UI::FancyFrame::;
3218
3219sub new {
3220 my $class = shift;
3221
3222 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3223
3224 $self->add (my $vb = new CFClient::UI::VBox);
3225
3226
3227 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3228 text => "start recording",
3229 tooltip => "Start/Stops recording of actions."
3230 ."All subsequent actions after the recording started will be captured."
3231 ."The actions are displayed after the record was stopped."
3232 ."To bind the action you have to click on the 'Bind' button",
3233 on_activate => sub {
3234 unless ($self->{recording}) {
3235 $self->start;
3236 } else {
3237 $self->stop;
3238 }
3239 });
3240
3241 $vb->add (new CFClient::UI::Label text => "Actions:");
3242 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3243
3244 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3245 $vb->add (my $hb = new CFClient::UI::HBox);
3246 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3247 $hb->add (new CFClient::UI::Button
3248 text => "bind",
3249 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3250 on_activate => sub {
3251 $self->ask_for_bind;
3252 });
3253
3254 $vb->add (my $hb = new CFClient::UI::HBox);
3255 $hb->add (new CFClient::UI::Button
3256 text => "ok",
3257 expand => 1,
3258 tooltip => "This closes the binding editor and saves the binding",
3259 on_activate => sub {
3260 $self->hide;
3261 $self->commit;
3262 });
3263
3264 $hb->add (new CFClient::UI::Button
3265 text => "cancel",
3266 expand => 1,
3267 tooltip => "This closes the binding editor without saving",
3268 on_activate => sub {
3269 $self->hide;
3270 $self->{binding_cancel}->()
3271 if $self->{binding_cancel};
3272 });
3273
3274 $self->update_binding_widgets;
3275
3276 $self
3277}
3278
3279sub commit {
3280 my ($self) = @_;
3281 my ($mod, $sym, $cmds) = $self->get_binding;
3282 if ($sym != 0 && @$cmds > 0) {
3283 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3284 ."'. Don't forget 'Save Config'!");
3285 $self->{binding_change}->($mod, $sym, $cmds)
3286 if $self->{binding_change};
3287 } else {
3288 $::STATUSBOX->add ("No action bound, no key or action specified!");
3289 $self->{binding_cancel}->()
3290 if $self->{binding_cancel};
3291 }
3292}
3293
3294sub start {
3295 my ($self) = @_;
3296
3297 $self->{rec_btn}->set_text ("stop recording");
3298 $self->{recording} = 1;
3299 $self->clear_command_list;
3300 $::CONN->start_record if $::CONN;
3301}
3302
3303sub stop {
3304 my ($self) = @_;
3305
3306 $self->{rec_btn}->set_text ("start recording");
3307 $self->{recording} = 0;
3308
3309 my $rec;
3310 $rec = $::CONN->stop_record if $::CONN;
3311 return unless ref $rec eq 'ARRAY';
3312 $self->set_command_list ($rec);
3313}
3314
3315sub ask_for_bind {
3316 my ($self, $commit) = @_;
3317
3318 CFClient::Binder::open_binding_dialog (sub {
3319 my ($mod, $sym) = @_;
3320 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3321 $self->update_binding_widgets;
3322 $self->commit if $commit;
3323 });
3324}
3325
3326sub set_binding {
3327 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3328
3329 $self->clear_command_list;
3330 $self->{recording} = 0;
3331 $self->{rec_btn}->set_text ("start recording");
3332
3333 $self->{binding} = [$mod, $sym];
3334 $self->{commands} = $cmds;
3335
3336 $self->{binding_change} = $cb;
3337 $self->{binding_cancel} = $ccb;
3338
3339 $self->update_binding_widgets;
3340}
3341
3342sub update_binding_widgets {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3346 $self->set_command_list ($cmds);
3347}
3348
3349sub get_binding {
3350 my ($self) = @_;
3351 return (
3352 $self->{binding}->[0],
3353 $self->{binding}->[1],
3354 [ grep { defined $_ } @{$self->{commands}} ]
3355 );
3356}
3357
3358sub clear_command_list {
3359 my ($self) = @_;
3360 $self->{cmdbox}->clear ();
3361}
3362
3363sub set_command_list {
3364 my ($self, $cmds) = @_;
3365
3366 $self->{cmdbox}->clear ();
3367 $self->{commands} = $cmds;
3368
3369 my $idx = 0;
3370
3371 for (@$cmds) {
3372 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3373
3374 my $i = $idx;
3375 $hb->add (new CFClient::UI::Button
3376 text => "delete",
3377 tooltip => "Deletes the action from the record",
3378 on_activate => sub {
3379 $self->{cmdbox}->remove ($hb);
3380 $cmds->[$i] = undef;
3381 });
3382
3383 $hb->add (new CFClient::UI::Label text => $_);
3384
3385 $idx++
3386 }
3387}
3388
3389 3937
3390############################################################################# 3938#############################################################################
3391 3939
3392package CFClient::UI; 3940package CFClient::UI;
3393 3941

Diff Legend

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