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.264 by root, Thu Jun 1 02:58:30 2006 UTC vs.
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC

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

Diff Legend

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