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

Diff Legend

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