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.257 by root, Tue May 30 02:22:02 2006 UTC vs.
Revision 1.310 by root, Fri Jun 23 20:28:20 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) {
… …
26 55
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/; 56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/; 57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w}; 58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h}; 59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
31 } 62 }
32 63
33 $layout 64 $layout
34} 65}
35 66
36sub set_layout { 67sub set_layout {
37 my ($layout) = @_; 68 my ($layout) = @_;
69
38 $LAYOUT = $layout; 70 $LAYOUT = $layout;
39}
40
41sub check_tooltip {
42 if (!$GRAB) {
43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
44 if (length $widget->{tooltip}) {
45
46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
49 $TOOLTIP->{owner} = $widget;
50
51 my $tip = $widget->{tooltip};
52
53 $tip = $tip->($widget) if CODE:: eq ref $tip;
54
55 $TOOLTIP->set_tooltip_from ($widget);
56 $TOOLTIP->show;
57 }
58
59 return;
60 }
61 }
62 }
63
64 $TOOLTIP->hide;
65 delete $TOOLTIP->{owner};
66} 71}
67 72
68# class methods for events 73# class methods for events
69sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
70 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
84 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
85 90
86 $GRAB = $widget; 91 $GRAB = $widget;
87 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
88 93
89 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
90 } 95 }
91 96
92 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
93 98
94 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
109 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
110 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
111 $grab->update if $grab; 116 $grab->update if $grab;
112 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
113 118
114 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
115 } 120 }
116} 121}
117 122
118sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
119 my ($ev) = @_; 124 my ($ev) = @_;
… …
125 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
126 131
127 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
128 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
129 134
130 check_tooltip; 135 $TOOLTIP_WATCHER->start;
131 } 136 }
132 137
133 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
134 if $HOVER; 139 if $HOVER;
135} 140}
… …
167sub rescale_widgets { 172sub rescale_widgets {
168 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
169 174
170 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
171 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174 179
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181 186
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/; 187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/; 188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184 189
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
… …
207 h => undef, 212 h => undef,
208 can_events => 1, 213 can_events => 1,
209 @_ 214 @_
210 }, $class; 215 }, $class;
211 216
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
223 218
224 for (keys %$self) { 219 for (keys %$self) {
225 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
226 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
227 } 222 }
228 } 223 }
229 224
225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
236
230 $self 237 $self
231} 238}
232 239
233sub destroy { 240sub destroy {
234 my ($self) = @_; 241 my ($self) = @_;
… …
265 272
266 return unless $self->{visible}; 273 return unless $self->{visible};
267 274
268 $_->set_invisible for $self->children; 275 $_->set_invisible for $self->children;
269 276
277 delete $self->{visible};
270 delete $self->{root}; 278 delete $self->{root};
271 delete $self->{visible};
272 279
273 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
274 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
275 282
276 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
277 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
278 285
279 $self->focus_out; 286 $self->emit ("focus_out");
280
281 $self->emit (visibility_change => 0); 287 $self->emit (visibility_change => 0);
282} 288}
283 289
284sub set_visibility { 290sub set_visibility {
285 my ($self, $visible) = @_; 291 my ($self, $visible) = @_;
… …
308} 314}
309 315
310sub move_abs { 316sub move_abs {
311 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
312 318
313 $self->{x} = List::Util::max 0, int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
314 $self->{y} = List::Util::max 0, int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
315 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
316 322
317 $self->update; 323 $self->update;
318} 324}
319 325
… …
350 $self->{x} = $x; 356 $self->{x} = $x;
351 $self->{y} = $y; 357 $self->{y} = $y;
352 $self->update; 358 $self->update;
353 } 359 }
354 360
355 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
356 return unless $self->{visible}; 362 return unless $self->{visible};
357 363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
358 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 367 $self->{root}{size_alloc}{$self+0} = $self;
359 } 368 }
360}
361
362sub size_allocate {
363 # nothing to be done
364} 369}
365 370
366sub children { 371sub children {
372 # nop
373}
374
375sub visible_children {
376 $_[0]->children
367} 377}
368 378
369sub set_max_size { 379sub set_max_size {
370 my ($self, $w, $h) = @_; 380 my ($self, $w, $h) = @_;
371 381
372 delete $self->{max_w}; $self->{max_w} = $w if $w; 382 $self->{max_w} = int $w if defined $w;
373 delete $self->{max_h}; $self->{max_h} = $h if $h; 383 $self->{max_h} = int $h if defined $h;
384
385 $self->realloc;
374} 386}
375 387
376sub set_tooltip { 388sub set_tooltip {
377 my ($self, $tooltip) = @_; 389 my ($self, $tooltip) = @_;
378 390
… …
383 395
384 $self->{tooltip} = $tooltip; 396 $self->{tooltip} = $tooltip;
385 397
386 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 398 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
387 delete $CFClient::UI::TOOLTIP->{owner}; 399 delete $CFClient::UI::TOOLTIP->{owner};
388 CFClient::UI::check_tooltip; 400 $CFClient::UI::TOOLTIP_WATCHER->cb->();
389 } 401 }
390} 402}
391 403
392# translate global coordinates to local coordinate system 404# translate global coordinates to local coordinate system
393sub coord2local { 405sub coord2local {
… …
401 my ($self, $x, $y) = @_; 413 my ($self, $x, $y) = @_;
402 414
403 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 415 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
404} 416}
405 417
406sub focus_in { 418sub invoke_focus_in {
407 my ($self) = @_; 419 my ($self) = @_;
408 420
409 return if $FOCUS == $self; 421 return if $FOCUS == $self;
410 return unless $self->{can_focus}; 422 return unless $self->{can_focus};
411 423
412 my $focus = $FOCUS; $FOCUS = $self; 424 my $focus = $FOCUS; $FOCUS = $self;
413 425
414 $self->_emit (focus_in => $focus);
415
416 $focus->update if $focus; 426 $focus->update if $focus;
417 $FOCUS->update; 427 $FOCUS->update;
418}
419 428
429 0
430}
431
420sub focus_out { 432sub invoke_focus_out {
421 my ($self) = @_; 433 my ($self) = @_;
422 434
423 return unless $FOCUS == $self; 435 return unless $FOCUS == $self;
424 436
425 my $focus = $FOCUS; undef $FOCUS; 437 my $focus = $FOCUS; undef $FOCUS;
426 438
427 $self->_emit (focus_out => $focus);
428
429 $focus->update if $focus; #? 439 $focus->update if $focus; #?
430 440
431 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 441 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
432 unless $FOCUS; 442 unless $FOCUS;
433}
434 443
444 0
445}
446
447sub grab_focus {
448 my ($self) = @_;
449
450 $self->emit ("focus_in");
451}
452
435sub mouse_motion { } 453sub invoke_mouse_motion { 1 }
436sub button_up { } 454sub invoke_button_up { 1 }
437sub key_down { } 455sub invoke_key_down { 1 }
438sub key_up { } 456sub invoke_key_up { 1 }
439 457
440sub button_down { 458sub invoke_button_down {
441 my ($self, $ev, $x, $y) = @_; 459 my ($self, $ev, $x, $y) = @_;
442 460
443 $self->focus_in; 461 $self->grab_focus;
444}
445 462
446sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 463 1
447sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 464}
448sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 465
449sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 466sub connect {
450sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 467 my ($self, $signal, $cb) = @_;
468
469 push @{ $self->{signal_cb}{$signal} }, $cb;
470}
471
472sub emit {
473 my ($self, $signal, @args) = @_;
474
475 #d##TODO# stop propagating at first true, do not use sum
476 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
477 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
478 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
479}
451 480
452sub find_widget { 481sub find_widget {
453 my ($self, $x, $y) = @_; 482 my ($self, $x, $y) = @_;
454 483
455 return () unless $self->{can_events}; 484 return () unless $self->{can_events};
… …
463 492
464sub set_parent { 493sub set_parent {
465 my ($self, $parent) = @_; 494 my ($self, $parent) = @_;
466 495
467 Scalar::Util::weaken ($self->{parent} = $parent); 496 Scalar::Util::weaken ($self->{parent} = $parent);
468
469 $self->set_visible if $parent->{visible}; 497 $self->set_visible if $parent->{visible};
470} 498}
471 499
472sub connect {
473 my ($self, $signal, $cb) = @_;
474
475 push @{ $self->{signal_cb}{$signal} }, $cb;
476}
477
478sub _emit {
479 my ($self, $signal, @args) = @_;
480
481 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
482}
483
484sub emit {
485 my ($self, $signal, @args) = @_;
486
487 $self->_emit ($signal, @args)
488 || $self->$signal (@args);
489}
490
491sub visibility_change {
492 #my ($self, $visible) = @_;
493}
494
495sub realloc { 500sub realloc {
496 my ($self) = @_; 501 my ($self) = @_;
497 502
498 if ($self->{visible}) { 503 if ($self->{visible}) {
499 return if $self->{root}{realloc}{$self}; 504 return if $self->{root}{realloc}{$self+0};
500 505
501 $self->{root}{realloc}{$self} = $self; 506 $self->{root}{realloc}{$self+0} = $self;
502 $self->{root}->update; 507 $self->{root}->update;
503 } else { 508 } else {
504 delete $self->{req_w}; 509 delete $self->{req_w};
510 delete $self->{req_h};
505 } 511 }
506} 512}
507 513
508sub update { 514sub update {
509 my ($self) = @_; 515 my ($self) = @_;
… …
517 523
518 $self->realloc; 524 $self->realloc;
519 $self->update; 525 $self->update;
520} 526}
521 527
528# using global variables seems a bit hacky, but passing through all drawing
529# functions seems pointless.
530our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
531
522sub draw { 532sub draw {
523 my ($self) = @_; 533 my ($self) = @_;
524 534
525 return unless $self->{h} && $self->{w}; 535 return unless $self->{h} && $self->{w};
536
537 # update screen rectangle
538 local $draw_x = $draw_x + $self->{x};
539 local $draw_y = $draw_y + $self->{y};
540 local $draw_w = $draw_x + $self->{w};
541 local $draw_h = $draw_y + $self->{h};
542
543 # skip widgets that are entirely outside the drawing area
544 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
545 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
526 546
527 glPushMatrix; 547 glPushMatrix;
528 glTranslate $self->{x}, $self->{y}, 0; 548 glTranslate $self->{x}, $self->{y}, 0;
529 $self->_draw;
530 glPopMatrix;
531 549
532 if ($self == $HOVER && $self->{can_hover}) { 550 if ($self == $HOVER && $self->{can_hover}) {
533 my ($x, $y) = @$self{qw(x y)};
534
535 glColor 1, 0.8, 0.5, 0.2; 551 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
536 glEnable GL_BLEND; 552 glEnable GL_BLEND;
537 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 553 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
538 glBegin GL_QUADS; 554 glBegin GL_QUADS;
539 glVertex $x , $y; 555 glVertex 0 , 0;
540 glVertex $x + $self->{w}, $y; 556 glVertex $self->{w}, 0;
541 glVertex $x + $self->{w}, $y + $self->{h}; 557 glVertex $self->{w}, $self->{h};
542 glVertex $x , $y + $self->{h}; 558 glVertex 0 , $self->{h};
543 glEnd; 559 glEnd;
544 glDisable GL_BLEND; 560 glDisable GL_BLEND;
545 } 561 }
546 562
547 if ($ENV{CFPLUS_DEBUG}) { 563 if ($ENV{CFPLUS_DEBUG} & 1) {
548 glPushMatrix; 564 glPushMatrix;
549 glColor 1, 1, 0, 1; 565 glColor 1, 1, 0, 1;
550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 566 glTranslate 0.375, 0.375;
551 glBegin GL_LINE_LOOP; 567 glBegin GL_LINE_LOOP;
552 glVertex 0 , 0; 568 glVertex 0 , 0;
553 glVertex $self->{w} - 1, 0; 569 glVertex $self->{w} - 1, 0;
554 glVertex $self->{w} - 1, $self->{h} - 1; 570 glVertex $self->{w} - 1, $self->{h} - 1;
555 glVertex 0 , $self->{h} - 1; 571 glVertex 0 , $self->{h} - 1;
556 glEnd; 572 glEnd;
557 glPopMatrix; 573 glPopMatrix;
558 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 574 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
559 } 575 }
576
577 $self->_draw;
578 glPopMatrix;
560} 579}
561 580
562sub _draw { 581sub _draw {
563 my ($self) = @_; 582 my ($self) = @_;
564 583
… …
567 586
568sub DESTROY { 587sub DESTROY {
569 my ($self) = @_; 588 my ($self) = @_;
570 589
571 delete $WIDGET{$self+0}; 590 delete $WIDGET{$self+0};
572 #$self->deactivate; 591
592 eval { $self->destroy };
593 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
573} 594}
574 595
575############################################################################# 596#############################################################################
576 597
577package CFClient::UI::DrawBG; 598package CFClient::UI::DrawBG;
… …
602 623
603 if ($color && (@$color < 4 || $color->[3])) { 624 if ($color && (@$color < 4 || $color->[3])) {
604 my ($w, $h) = @$self{qw(w h)}; 625 my ($w, $h) = @$self{qw(w h)};
605 626
606 glEnable GL_BLEND; 627 glEnable GL_BLEND;
607 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 628 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
608 glColor @$color; 629 glColor_premultiply @$color;
609 630
610 glBegin GL_QUADS; 631 glBegin GL_QUADS;
611 glVertex 0 , 0; 632 glVertex 0 , 0;
612 glVertex 0 , $h; 633 glVertex 0 , $h;
613 glVertex $w, $h; 634 glVertex $w, $h;
… …
644our @ISA = CFClient::UI::Base::; 665our @ISA = CFClient::UI::Base::;
645 666
646sub new { 667sub new {
647 my ($class, %arg) = @_; 668 my ($class, %arg) = @_;
648 669
649 my $children = delete $arg{children} || []; 670 my $children = delete $arg{children};
650 671
651 my $self = $class->SUPER::new ( 672 my $self = $class->SUPER::new (
652 children => [], 673 children => [],
653 can_events => 0, 674 can_events => 0,
654 %arg, 675 %arg,
655 ); 676 );
677
656 $self->add ($_) for @$children; 678 $self->add (@$children)
679 if $children;
657 680
658 $self 681 $self
659} 682}
660 683
661sub add { 684sub add {
… …
709 $x -= $self->{x}; 732 $x -= $self->{x};
710 $y -= $self->{y}; 733 $y -= $self->{y};
711 734
712 my $res; 735 my $res;
713 736
714 for (reverse @{ $self->{children} }) { 737 for (reverse $self->visible_children) {
715 $res = $_->find_widget ($x, $y) 738 $res = $_->find_widget ($x, $y)
716 and return $res; 739 and return $res;
717 } 740 }
718 741
719 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 742 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
740} 763}
741 764
742sub add { 765sub add {
743 my ($self, $child) = @_; 766 my ($self, $child) = @_;
744 767
745 $self->{children} = []; 768 $self->SUPER::remove ($_) for @{ $self->{children} };
746
747 $self->SUPER::add ($child); 769 $self->SUPER::add ($child);
748} 770}
749 771
750sub remove { 772sub remove {
751 my ($self, $widget) = @_; 773 my ($self, $widget) = @_;
… …
760 782
761sub size_request { 783sub size_request {
762 $_[0]{children}[0]->size_request 784 $_[0]{children}[0]->size_request
763} 785}
764 786
765sub size_allocate { 787sub invoke_size_allocate {
766 my ($self, $w, $h, $changed) = @_; 788 my ($self, $w, $h) = @_;
767 789
768 $self->{children}[0]->configure (0, 0, $w, $h); 790 $self->{children}[0]->configure (0, 0, $w, $h);
791
792 1
769} 793}
770 794
771############################################################################# 795#############################################################################
796
797# back-buffered drawing area
772 798
773package CFClient::UI::Window; 799package CFClient::UI::Window;
774 800
775our @ISA = CFClient::UI::Bin::; 801our @ISA = CFClient::UI::Bin::;
776 802
… …
787 813
788 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 814 $ROOT->on_post_alloc ($self => sub { $self->render_child });
789 $self->SUPER::update; 815 $self->SUPER::update;
790} 816}
791 817
792sub size_allocate { 818sub invoke_size_allocate {
793 my ($self, $w, $h, $changed) = @_; 819 my ($self, $w, $h) = @_;
794 820
795 $self->SUPER::size_allocate ($w, $h, $changed);
796 $self->update 821 $self->update;
797 if $changed; 822
823 $self->SUPER::invoke_size_allocate ($w, $h)
798} 824}
799 825
800sub _render { 826sub _render {
827 my ($self) = @_;
828
801 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
802} 830}
803 831
804sub render_child { 832sub render_child {
805 my ($self) = @_; 833 my ($self) = @_;
806 834
807 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
808 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
809 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
810 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
811 $self->_render; 846 $self->_render;
812 }; 847 };
813} 848}
814 849
815sub _draw { 850sub _draw {
816 my ($self) = @_; 851 my ($self) = @_;
817 852
818 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
819 854
820 my $tex = $self->{texture} 855 my $tex = $self->{texture}
821 or return; 856 or return;
822 857
823 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
824 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
825 glColor 1, 1, 1, 1; 860 glColor 0, 0, 0, 1;
826 861
827 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 862 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
828 863
829 glDisable GL_TEXTURE_2D; 864 glDisable GL_TEXTURE_2D;
830} 865}
… …
846} 881}
847 882
848sub size_request { 883sub size_request {
849 my ($self) = @_; 884 my ($self) = @_;
850 885
851 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
852 887
853 $w = 10 if $self->{scroll_x}; 888 $w = 10 if $self->{scroll_x};
854 $h = 10 if $self->{scroll_y}; 889 $h = 10 if $self->{scroll_y};
855 890
856 ($w, $h) 891 ($w, $h)
857} 892}
858 893
859sub size_allocate { 894sub invoke_size_allocate {
860 my ($self, $w, $h, $changed) = @_; 895 my ($self, $w, $h) = @_;
861 896
897 my $child = $self->child;
898
862 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 899 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
863 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 900 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
864 901
865 $self->child->configure (0, 0, $w, $h); 902 $self->child->configure (0, 0, $w, $h);
866 $self->update; 903 $self->update;
904
905 1
867} 906}
868 907
869sub set_offset { 908sub set_offset {
870 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
871 910
… …
904} 943}
905 944
906sub _render { 945sub _render {
907 my ($self) = @_; 946 my ($self) = @_;
908 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
909 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
910 952
911 $self->SUPER::_render; 953 $self->SUPER::_render;
912} 954}
913 955
… …
916package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
917 959
918our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
919 961
920sub new { 962sub new {
921 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
922 966
923 my $self; 967 my $self;
924 968
925 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
926 vertical => 1, 970 vertical => 1,
… …
931 ; 975 ;
932 976
933 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
934 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
935 slider => $slider, 979 slider => $slider,
936 @_, 980 %arg,
937 ); 981 );
938 982
939 $self->{vp}->add ($self->{scrolled});
940 $self->add ($self->{vp});
941 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
942 985
943 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
944} 993}
945 994
946sub update { 995sub update {
947 my ($self) = @_; 996 my ($self) = @_;
948 997
… …
951 # todo: overwrite size_allocate of child 1000 # todo: overwrite size_allocate of child
952 my $child = $self->{vp}->child; 1001 my $child = $self->{vp}->child;
953 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
954} 1003}
955 1004
956sub size_allocate { 1005sub invoke_size_allocate {
957 my ($self, $w, $h, $changed) = @_; 1006 my ($self, $w, $h) = @_;
958
959 $self->SUPER::size_allocate ($w, $h, $changed);
960 1007
961 my $child = $self->{vp}->child; 1008 my $child = $self->{vp}->child;
962 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1009 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1010
1011 $self->SUPER::invoke_size_allocate ($w, $h)
963} 1012}
964 1013
965#TODO# update range on size_allocate depending on child 1014#TODO# update range on size_allocate depending on child
966# update viewport offset on scroll 1015# update viewport offset on scroll
967 1016
… …
987 1036
988 if ($self->{bg}) { 1037 if ($self->{bg}) {
989 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
990 1039
991 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
992 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
993 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
994 1043
995 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
996 glVertex 0 , 0; 1045 glVertex 0 , 0;
997 glVertex 0 , $h; 1046 glVertex 0 , $h;
998 glVertex $w, $h; 1047 glVertex $w, $h;
… …
1020my @border = 1069my @border =
1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1023 1072
1024sub new { 1073sub new {
1025 my $class = shift; 1074 my ($class, %arg) = @_;
1026 1075
1027 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
1028 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
1029 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
1030 border => 0.6, 1079 border => 0.6,
1031 can_events => 1, 1080 can_events => 1,
1032 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
1033 ); 1084 );
1034 1085
1035 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title_widget} = new CFClient::UI::Label
1036 align => 0, 1087 align => 0,
1037 valign => 1, 1088 valign => 1,
1038 text => $self->{title}, 1089 text => $self->{title},
1039 fontsize => $self->{border}; 1090 fontsize => $self->{border},
1091 if exists $self->{title};
1092
1093 if ($self->{has_close_button}) {
1094 $self->{close_button} =
1095 new CFClient::UI::ImageButton
1096 path => 'x1_close.png',
1097 on_activate => sub { $self->hide };
1098
1099 $self->CFClient::UI::Container::add ($self->{close_button});
1100 }
1040 1101
1041 $self 1102 $self
1103}
1104
1105sub add {
1106 my ($self, @widgets) = @_;
1107
1108 $self->SUPER::add (@widgets);
1109 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1110 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1042} 1111}
1043 1112
1044sub border { 1113sub border {
1045 int $_[0]{border} * $::FONTSIZE 1114 int $_[0]{border} * $::FONTSIZE
1046} 1115}
1047 1116
1048sub size_request { 1117sub size_request {
1049 my ($self) = @_; 1118 my ($self) = @_;
1119
1120 $self->{title_widget}->size_request
1121 if $self->{title_widget};
1122
1123 $self->{close_button}->size_request
1124 if $self->{close_button};
1050 1125
1051 my ($w, $h) = $self->SUPER::size_request; 1126 my ($w, $h) = $self->SUPER::size_request;
1052 1127
1053 ( 1128 (
1054 $w + $self->border * 2, 1129 $w + $self->border * 2,
1055 $h + $self->border * 2, 1130 $h + $self->border * 2,
1056 ) 1131 )
1057} 1132}
1058 1133
1059sub size_allocate { 1134sub invoke_size_allocate {
1060 my ($self, $w, $h, $changed) = @_; 1135 my ($self, $w, $h) = @_;
1061 1136
1062 return unless $changed; 1137 if ($self->{title_widget}) {
1138 $self->{title_widget}{w} = $w;
1139 $self->{title_widget}{h} = $h;
1140 $self->{title_widget}->invoke_size_allocate ($w, $h);
1141 }
1063 1142
1143 my $border = $self->border;
1144
1064 $h -= List::Util::max 0, $self->border * 2; 1145 $h -= List::Util::max 0, $border * 2;
1065 $w -= List::Util::max 0, $self->border * 2; 1146 $w -= List::Util::max 0, $border * 2;
1066 1147
1067 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1068 if $self->{title};
1069
1070 $self->child->configure ($self->border, $self->border, $w, $h); 1148 $self->child->configure ($border, $border, $w, $h);
1071}
1072 1149
1150 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1151 if $self->{close_button};
1152
1153 1
1154}
1155
1073sub button_down { 1156sub invoke_button_down {
1074 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1075 1158
1076 my ($w, $h) = @$self{qw(w h)}; 1159 my ($w, $h) = @$self{qw(w h)};
1077 my $border = $self->border; 1160 my $border = $self->border;
1078 1161
… …
1094 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1095 1178
1096 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1097 $self->{force_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1098 1181
1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1099 $self->realloc; 1183 $self->realloc;
1100 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1101 }; 1184 };
1102 1185
1103 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1104 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1105 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1108 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1109 1192
1110 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1111 1194
1112 $self->move_abs ($bx + $x - $ox, $by + $y - $oy); 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1196 # HACK: the next line is required to enforce placement
1197 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1113 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1114 } 1203 1
1115} 1204}
1116 1205
1117sub button_up { 1206sub invoke_button_up {
1118 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1119 1208
1120 delete $self->{motion}; 1209 ! ! delete $self->{motion}
1121} 1210}
1122 1211
1123sub mouse_motion { 1212sub invoke_mouse_motion {
1124 my ($self, $ev, $x, $y) = @_; 1213 my ($self, $ev, $x, $y) = @_;
1125 1214
1126 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1215 $self->{motion}->($ev, $x, $y) if $self->{motion};
1216
1217 ! ! $self->{motion}
1127} 1218}
1128 1219
1129sub _draw { 1220sub _draw {
1130 my ($self) = @_; 1221 my ($self) = @_;
1131 1222
1223 my $child = $self->{children}[0];
1224
1132 my ($w, $h ) = ($self->{w}, $self->{h}); 1225 my ($w, $h ) = ($self->{w}, $self->{h});
1133 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1226 my ($cw, $ch) = ($child->{w}, $child->{h});
1134 1227
1135 glEnable GL_TEXTURE_2D; 1228 glEnable GL_TEXTURE_2D;
1136 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1229 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1137 1230
1138 my $border = $self->border; 1231 my $border = $self->border;
… …
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1246 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1247 }
1155 1248
1156 glDisable GL_TEXTURE_2D; 1249 glDisable GL_TEXTURE_2D;
1157 1250
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1251 $child->draw;
1252
1253 if ($self->{title_widget}) {
1254 glTranslate 0, $border - $self->{h};
1255 $self->{title_widget}->_draw;
1256
1257 glTranslate 0, - ($border - $self->{h});
1258 }
1259
1260 $self->{close_button}->draw
1261 if $self->{close_button};
1161} 1262}
1162 1263
1163############################################################################# 1264#############################################################################
1164 1265
1165package CFClient::UI::Table; 1266package CFClient::UI::Table;
… …
1188 1289
1189 $child->set_parent ($self); 1290 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1291 $self->{children}[$y][$x] = $child;
1191 1292
1192 $self->realloc; 1293 $self->realloc;
1294}
1295
1296sub remove {
1297 my ($self, $child) = @_;
1298
1299 # TODO: not yet implemented
1193} 1300}
1194 1301
1195# TODO: move to container class maybe? send children a signal on removal? 1302# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1303sub clear {
1197 my ($self) = @_; 1304 my ($self) = @_;
… …
1238 (sum @$ws), 1345 (sum @$ws),
1239 (sum @$hs), 1346 (sum @$hs),
1240 ) 1347 )
1241} 1348}
1242 1349
1243sub size_allocate { 1350sub invoke_size_allocate {
1244 my ($self, $w, $h, $changed) = @_; 1351 my ($self, $w, $h) = @_;
1245 1352
1246 my ($ws, $hs) = $self->get_wh; 1353 my ($ws, $hs) = $self->get_wh;
1247 1354
1248 my $req_w = (sum @$ws) || 1; 1355 my $req_w = (sum @$ws) || 1;
1249 my $req_h = (sum @$hs) || 1; 1356 my $req_h = (sum @$hs) || 1;
… …
1280 } 1387 }
1281 1388
1282 $y += $row_h; 1389 $y += $row_h;
1283 } 1390 }
1284 1391
1392 1
1285} 1393}
1286 1394
1287sub find_widget { 1395sub find_widget {
1288 my ($self, $x, $y) = @_; 1396 my ($self, $x, $y) = @_;
1289 1397
… …
1326 (List::Util::sum map $_->{req_w}, @{$self->{children}}), 1434 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1327 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1435 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1328 ) 1436 )
1329} 1437}
1330 1438
1331sub size_allocate { 1439sub invoke_size_allocate {
1332 my ($self, $w, $h, $changed) = @_; 1440 my ($self, $w, $h) = @_;
1333 1441
1334 my $space = $self->{vertical} ? $h : $w; 1442 my $space = $self->{vertical} ? $h : $w;
1335 my $children = $self->{children}; 1443 my @children = $self->visible_children;
1336 1444
1337 my @req; 1445 my @req;
1338 1446
1339 if ($self->{homogeneous}) { 1447 if ($self->{homogeneous}) {
1340 @req = ($space / (@$children || 1)) x @$children; 1448 @req = ($space / (@children || 1)) x @children;
1341 } else { 1449 } else {
1342 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children; 1450 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1343 my $req = List::Util::sum @req; 1451 my $req = List::Util::sum @req;
1344 1452
1345 if ($req > $space) { 1453 if ($req > $space) {
1346 # ah well, not enough space 1454 # ah well, not enough space
1347 $_ *= $space / $req for @req; 1455 $_ *= $space / $req for @req;
1348 } else { 1456 } else {
1349 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1; 1457 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1350 1458
1351 $space = ($space - $req) / $expand; # remaining space to give away 1459 $space = ($space - $req) / $expand; # remaining space to give away
1352 1460
1353 $req[$_] += $space * $children->[$_]{expand} 1461 $req[$_] += $space * $children[$_]{expand}
1354 for 0 .. $#$children; 1462 for 0 .. $#children;
1355 } 1463 }
1356 } 1464 }
1357 1465
1358 CFClient::UI::harmonize \@req; 1466 CFClient::UI::harmonize \@req;
1359 1467
1360 my $pos = 0; 1468 my $pos = 0;
1361 for (0 .. $#$children) { 1469 for (0 .. $#children) {
1362 my $alloc = $req[$_]; 1470 my $alloc = $req[$_];
1363 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h)); 1471 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1364 1472
1365 $pos += $alloc; 1473 $pos += $alloc;
1366 } 1474 }
1367 1475
1368 1 1476 1
… …
1420 ellipsise => 3, # end 1528 ellipsise => 3, # end
1421 layout => (new CFClient::Layout), 1529 layout => (new CFClient::Layout),
1422 fontsize => 1, 1530 fontsize => 1,
1423 align => -1, 1531 align => -1,
1424 valign => -1, 1532 valign => -1,
1425 padding => 2, 1533 padding_x => 2,
1534 padding_y => 2,
1426 can_events => 0, 1535 can_events => 0,
1427 %arg 1536 %arg
1428 ); 1537 );
1429 1538
1430 if (exists $self->{template}) { 1539 if (exists $self->{template}) {
… …
1457 1566
1458 delete $self->{texture}; 1567 delete $self->{texture};
1459 $self->SUPER::update; 1568 $self->SUPER::update;
1460} 1569}
1461 1570
1571sub realloc {
1572 my ($self) = @_;
1573
1574 delete $self->{ox};
1575 $self->SUPER::realloc;
1576}
1577
1462sub set_text { 1578sub set_text {
1463 my ($self, $text) = @_; 1579 my ($self, $text) = @_;
1464 1580
1465 return if $self->{text} eq "T$text"; 1581 return if $self->{text} eq "T$text";
1466 $self->{text} = "T$text"; 1582 $self->{text} = "T$text";
1467 1583
1468 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1584 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1469 $self->{layout}->set_text ($text); 1585 $self->{layout}->set_text ($text);
1470 1586
1587 delete $self->{size_req};
1471 $self->realloc; 1588 $self->realloc;
1472 $self->update; 1589 $self->update;
1473} 1590}
1474 1591
1475sub set_markup { 1592sub set_markup {
… …
1481 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1598 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1482 1599
1483 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1600 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1484 $self->{layout}->set_markup ($markup); 1601 $self->{layout}->set_markup ($markup);
1485 1602
1603 delete $self->{size_req};
1486 $self->realloc; 1604 $self->realloc;
1487 $self->update; 1605 $self->update;
1488} 1606}
1489 1607
1490sub size_request { 1608sub size_request {
1491 my ($self) = @_; 1609 my ($self) = @_;
1492 1610
1611 $self->{size_req} ||= do {
1493 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1612 $self->{layout}->set_font ($self->{font}) if $self->{font};
1494 $self->{layout}->set_width ($self->{max_w} || -1); 1613 $self->{layout}->set_width ($self->{max_w} || -1);
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1614 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1615 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1616 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1617
1499 my ($w, $h) = $self->{layout}->size; 1618 my ($w, $h) = $self->{layout}->size;
1500 1619
1501 if (exists $self->{template}) { 1620 if (exists $self->{template}) {
1502 $self->{template}->set_font ($self->{font}) if $self->{font}; 1621 $self->{template}->set_font ($self->{font}) if $self->{font};
1503 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1622 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1504 1623
1505 my ($w2, $h2) = $self->{template}->size; 1624 my ($w2, $h2) = $self->{template}->size;
1506 1625
1507 $w = List::Util::max $w, $w2; 1626 $w = List::Util::max $w, $w2;
1508 $h = List::Util::max $h, $h2; 1627 $h = List::Util::max $h, $h2;
1628 }
1629
1630 [$w, $h]
1509 } 1631 };
1510 1632
1511 ( 1633 @{ $self->{size_req} }
1512 $w + $self->{padding} * 2,
1513 $h + $self->{padding} * 2,
1514 )
1515} 1634}
1516 1635
1517sub size_allocate { 1636sub invoke_size_allocate {
1518 my ($self, $w, $h, $changed) = @_; 1637 my ($self, $w, $h) = @_;
1638
1639 delete $self->{ox};
1519 1640
1520 delete $self->{texture} 1641 delete $self->{texture}
1521 if $changed; 1642 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1643
1644 1
1522} 1645}
1523 1646
1524sub set_fontsize { 1647sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1526 1649
1527 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1651 delete $self->{texture};
1529 1652
1530 $self->realloc; 1653 $self->realloc;
1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1531} 1662}
1532 1663
1533sub _draw { 1664sub _draw {
1534 my ($self) = @_; 1665 my ($self) = @_;
1535 1666
… …
1541 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1542 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1543 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1544 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1545 1676
1546 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1547 1679
1680 unless (exists $self->{ox}) {
1548 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1549 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1550 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1551 1684
1552 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1553 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1554 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1555
1556 $tex
1557 }; 1688 };
1558 1689
1559 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1561 1694
1562 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1563 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1564 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1565 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1566 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1567 } 1702 }
1568 1703
1569 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1570} 1705}
1571 1706
… …
1588 can_hover => 1, 1723 can_hover => 1,
1589 can_focus => 1, 1724 can_focus => 1,
1590 valign => 0, 1725 valign => 0,
1591 can_events => 1, 1726 can_events => 1,
1592 #text => ... 1727 #text => ...
1728 #hidden => "*",
1593 @_ 1729 @_
1594 ) 1730 )
1595} 1731}
1596 1732
1597sub _set_text { 1733sub _set_text {
… …
1599 1735
1600 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1601 1737
1602 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1603 1739
1604 delete $self->{texture};
1605
1606 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1607 $self->{text} = $text; 1741 $self->{text} = $text;
1608 1742
1609 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1610 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1611 1746
1612 $self->_emit (changed => $self->{text}); 1747 $self->emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1613} 1751}
1614 1752
1615sub set_text { 1753sub set_text {
1616 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1617 1755
1618 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1619 $self->_set_text ($text); 1757 $self->_set_text ($text);
1620
1621 $self->realloc;
1622} 1758}
1623 1759
1624sub get_text { 1760sub get_text {
1625 $_[0]{text} 1761 $_[0]{text}
1626} 1762}
… …
1631 my ($w, $h) = $self->SUPER::size_request; 1767 my ($w, $h) = $self->SUPER::size_request;
1632 1768
1633 ($w + 1, $h) # add 1 for cursor 1769 ($w + 1, $h) # add 1 for cursor
1634} 1770}
1635 1771
1636sub key_down { 1772sub invoke_key_down {
1637 my ($self, $ev) = @_; 1773 my ($self, $ev) = @_;
1638 1774
1639 my $mod = $ev->{mod}; 1775 my $mod = $ev->{mod};
1640 my $sym = $ev->{sym}; 1776 my $sym = $ev->{sym};
1641 my $uni = $ev->{unicode}; 1777 my $uni = $ev->{unicode};
… …
1653 } elsif ($sym == CFClient::SDLK_HOME) { 1789 } elsif ($sym == CFClient::SDLK_HOME) {
1654 $self->{cursor} = 0; 1790 $self->{cursor} = 0;
1655 } elsif ($sym == CFClient::SDLK_END) { 1791 } elsif ($sym == CFClient::SDLK_END) {
1656 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1657 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1658 $self->_emit ('escape'); 1794 $self->emit ('escape');
1659 } elsif ($uni) { 1795 } elsif ($uni) {
1660 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1661 } 1799 }
1662 1800
1663 $self->_set_text ($text); 1801 $self->_set_text ($text);
1664 1802
1665 $self->realloc; 1803 $self->realloc;
1666}
1667 1804
1805 1
1806}
1807
1668sub focus_in { 1808sub invoke_focus_in {
1669 my ($self) = @_; 1809 my ($self) = @_;
1670 1810
1671 $self->{last_activity} = $::NOW; 1811 $self->{last_activity} = $::NOW;
1672 1812
1673 $self->SUPER::focus_in; 1813 $self->SUPER::invoke_focus_in
1674} 1814}
1675 1815
1676sub button_down { 1816sub invoke_button_down {
1677 my ($self, $ev, $x, $y) = @_; 1817 my ($self, $ev, $x, $y) = @_;
1678 1818
1679 $self->SUPER::button_down ($ev, $x, $y); 1819 $self->SUPER::invoke_button_down ($ev, $x, $y);
1680 1820
1681 my $idx = $self->{layout}->xy_to_index ($x, $y); 1821 my $idx = $self->{layout}->xy_to_index ($x, $y);
1682 1822
1683 # byte-index to char-index 1823 # byte-index to char-index
1684 my $text = $self->{text}; 1824 my $text = $self->{text};
1685 utf8::encode $text; 1825 utf8::encode $text;
1686 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1687 1827
1688 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1689 $self->update; 1829 $self->update;
1830
1831 1
1690} 1832}
1691 1833
1692sub mouse_motion { 1834sub invoke_mouse_motion {
1693 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1694# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 1
1695} 1839}
1696 1840
1697sub _draw { 1841sub _draw {
1698 my ($self) = @_; 1842 my ($self) = @_;
1699 1843
1700 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1701 1845
1702 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1703 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1704 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1705 } else { 1849 } else {
1706 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1707 } 1851 }
1708 1852
1709 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1710 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1711 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1712 glVertex 0 , 0; 1856 glVertex 0 , 0;
1713 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1714 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1715 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1740 1884
1741our @ISA = CFClient::UI::EntryBase::; 1885our @ISA = CFClient::UI::EntryBase::;
1742 1886
1743use CFClient::OpenGL; 1887use CFClient::OpenGL;
1744 1888
1745sub key_down { 1889sub invoke_key_down {
1746 my ($self, $ev) = @_; 1890 my ($self, $ev) = @_;
1747 1891
1748 my $sym = $ev->{sym}; 1892 my $sym = $ev->{sym};
1749 1893
1750 if ($sym == 13) { 1894 if ($sym == 13) {
1751 unshift @{$self->{history}}, 1895 unshift @{$self->{history}},
1752 my $txt = $self->get_text; 1896 my $txt = $self->get_text;
1897
1753 $self->{history_pointer} = -1; 1898 $self->{history_pointer} = -1;
1754 $self->{history_saveback} = ''; 1899 $self->{history_saveback} = '';
1755 $self->_emit (activate => $txt); 1900 $self->emit (activate => $txt);
1756 $self->update; 1901 $self->update;
1757 1902
1758 } elsif ($sym == CFClient::SDLK_UP) { 1903 } elsif ($sym == CFClient::SDLK_UP) {
1759 if ($self->{history_pointer} < 0) { 1904 if ($self->{history_pointer} < 0) {
1760 $self->{history_saveback} = $self->get_text; 1905 $self->{history_saveback} = $self->get_text;
… …
1776 } else { 1921 } else {
1777 $self->set_text ($self->{history_saveback}); 1922 $self->set_text ($self->{history_saveback});
1778 } 1923 }
1779 1924
1780 } else { 1925 } else {
1781 $self->SUPER::key_down ($ev); 1926 return $self->SUPER::invoke_key_down ($ev)
1927 }
1928
1782 } 1929 1
1783
1784} 1930}
1785 1931
1786############################################################################# 1932#############################################################################
1787 1933
1788package CFClient::UI::Button; 1934package CFClient::UI::Button;
… …
1797 1943
1798sub new { 1944sub new {
1799 my $class = shift; 1945 my $class = shift;
1800 1946
1801 $class->SUPER::new ( 1947 $class->SUPER::new (
1802 padding => 4, 1948 padding_x => 4,
1949 padding_y => 4,
1803 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1804 active_fg => [0, 0, 1], 1951 active_fg => [0, 0, 1],
1805 can_hover => 1, 1952 can_hover => 1,
1806 align => 0, 1953 align => 0,
1807 valign => 0, 1954 valign => 0,
1808 can_events => 1, 1955 can_events => 1,
1809 @_ 1956 @_
1810 ) 1957 )
1811} 1958}
1812 1959
1813sub activate { }
1814
1815sub button_up { 1960sub invoke_button_up {
1816 my ($self, $ev, $x, $y) = @_; 1961 my ($self, $ev, $x, $y) = @_;
1817 1962
1818 $self->emit ("activate") 1963 $self->emit ("activate")
1819 if $x >= 0 && $x < $self->{w} 1964 if $x >= 0 && $x < $self->{w}
1820 && $y >= 0 && $y < $self->{h}; 1965 && $y >= 0 && $y < $self->{h};
1966
1967 1
1821} 1968}
1822 1969
1823sub _draw { 1970sub _draw {
1824 my ($self) = @_; 1971 my ($self) = @_;
1825 1972
1826 local $self->{fg} = $self->{fg}; 1973 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1827
1828 if ($GRAB == $self) {
1829 $self->{fg} = $self->{active_fg};
1830 }
1831 1974
1832 glEnable GL_TEXTURE_2D; 1975 glEnable GL_TEXTURE_2D;
1833 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1976 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1834 glColor 0, 0, 0, 1; 1977 glColor 0, 0, 0, 1;
1835 1978
… …
1840 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1841} 1984}
1842 1985
1843############################################################################# 1986#############################################################################
1844 1987
1988package CFClient::UI::ImageButton;
1989
1990our @ISA = CFClient::UI::Image::;
1991
1992use CFClient::OpenGL;
1993
1994my %textures;
1995
1996sub new {
1997 my $class = shift;
1998
1999 my $self = $class->SUPER::new (
2000 padding_x => 4,
2001 padding_y => 4,
2002 fg => [1, 1, 1],
2003 active_fg => [0, 0, 1],
2004 can_hover => 1,
2005 align => 0,
2006 valign => 0,
2007 can_events => 1,
2008 @_
2009 );
2010}
2011
2012sub invoke_button_up {
2013 my ($self, $ev, $x, $y) = @_;
2014
2015 $self->emit ("activate")
2016 if $x >= 0 && $x < $self->{w}
2017 && $y >= 0 && $y < $self->{h};
2018
2019 1
2020}
2021
2022#############################################################################
2023
1845package CFClient::UI::CheckBox; 2024package CFClient::UI::CheckBox;
1846 2025
1847our @ISA = CFClient::UI::DrawBG::; 2026our @ISA = CFClient::UI::DrawBG::;
1848 2027
1849my @tex = 2028my @tex =
… …
1854 2033
1855sub new { 2034sub new {
1856 my $class = shift; 2035 my $class = shift;
1857 2036
1858 $class->SUPER::new ( 2037 $class->SUPER::new (
1859 padding => 2, 2038 padding_x => 2,
2039 padding_y => 2,
1860 fg => [1, 1, 1], 2040 fg => [1, 1, 1],
1861 active_fg => [1, 1, 0], 2041 active_fg => [1, 1, 0],
1862 bg => [0, 0, 0, 0.2], 2042 bg => [0, 0, 0, 0.2],
1863 active_bg => [1, 1, 1, 0.5], 2043 active_bg => [1, 1, 1, 0.5],
1864 state => 0, 2044 state => 0,
… …
1868} 2048}
1869 2049
1870sub size_request { 2050sub size_request {
1871 my ($self) = @_; 2051 my ($self) = @_;
1872 2052
1873 ($self->{padding} * 2 + 6) x 2 2053 (6) x 2
1874} 2054}
1875 2055
1876sub button_down { 2056sub invoke_button_down {
1877 my ($self, $ev, $x, $y) = @_; 2057 my ($self, $ev, $x, $y) = @_;
1878 2058
1879 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2059 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1880 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2060 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1881 $self->{state} = !$self->{state}; 2061 $self->{state} = !$self->{state};
1882 $self->_emit (changed => $self->{state}); 2062 $self->emit (changed => $self->{state});
2063 } else {
2064 return 0
2065 }
2066
1883 } 2067 1
1884} 2068}
1885 2069
1886sub _draw { 2070sub _draw {
1887 my ($self) = @_; 2071 my ($self) = @_;
1888 2072
1889 $self->SUPER::_draw; 2073 $self->SUPER::_draw;
1890 2074
1891 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2075 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1892 2076
1893 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2077 my ($w, $h) = @$self{qw(w h)};
2078
2079 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1894 2080
1895 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2081 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1896 2082
1897 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2083 my $tex = $self->{state} ? $tex[1] : $tex[0];
1898 2084
… …
1906package CFClient::UI::Image; 2092package CFClient::UI::Image;
1907 2093
1908our @ISA = CFClient::UI::Base::; 2094our @ISA = CFClient::UI::Base::;
1909 2095
1910use CFClient::OpenGL; 2096use CFClient::OpenGL;
1911use Carp qw/confess/;
1912 2097
1913our %loaded_images; 2098our %texture_cache;
1914 2099
1915sub new { 2100sub new {
1916 my $class = shift; 2101 my $class = shift;
1917 2102
1918 my $self = $class->SUPER::new (can_events => 0, @_); 2103 my $self = $class->SUPER::new (
2104 can_events => 0,
2105 @_,
2106 );
1919 2107
1920 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2108 $self->{path}
2109 or Carp::croak "required attribute 'path' not set";
1921 2110
1922 $loaded_images{$self->{image}} ||= 2111 $self->{tex} = $texture_cache{$self->{path}} ||=
1923 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2112 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1924 2113
1925 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2114 Scalar::Util::weaken $texture_cache{$self->{path}};
1926 2115
1927 Scalar::Util::weaken $loaded_images{$self->{image}}; 2116 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1928
1929 $self->{aspect} = $tex->{w} / $tex->{h};
1930 2117
1931 $self 2118 $self
1932} 2119}
1933 2120
1934sub size_request { 2121sub size_request {
1935 my ($self) = @_; 2122 my ($self) = @_;
1936 2123
1937 ($self->{tex}->{w}, $self->{tex}->{h}) 2124 ($self->{tex}{w}, $self->{tex}{h})
1938} 2125}
1939 2126
1940sub _draw { 2127sub _draw {
1941 my ($self) = @_; 2128 my ($self) = @_;
1942 2129
… …
2053 2240
2054 my $h1 = $self->{h} * (1 - $ycut1); 2241 my $h1 = $self->{h} * (1 - $ycut1);
2055 my $h2 = $self->{h} * (1 - $ycut2); 2242 my $h2 = $self->{h} * (1 - $ycut2);
2056 2243
2057 glEnable GL_BLEND; 2244 glEnable GL_BLEND;
2058 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2245 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2246 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2059 glEnable GL_TEXTURE_2D; 2247 glEnable GL_TEXTURE_2D;
2060 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2248 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2061 2249
2062 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2250 glBindTexture GL_TEXTURE_2D, $t1->{name};
2063 glBegin GL_QUADS; 2251 glBegin GL_QUADS;
… …
2177 $self->update; 2365 $self->update;
2178 2366
2179 $self 2367 $self
2180} 2368}
2181 2369
2182sub changed { }
2183
2184sub set_range { 2370sub set_range {
2185 my ($self, $range) = @_; 2371 my ($self, $range) = @_;
2186 2372
2187 ($range, $self->{range}) = ($self->{range}, $range); 2373 ($range, $self->{range}) = ($self->{range}, $range);
2188 2374
2189 $self->update
2190 if "@$range" ne "@{$self->{range}}"; 2375 if ("@$range" ne "@{$self->{range}}") {
2376 $self->update;
2377 $self->set_value ($self->{range}[0]);
2378 }
2191} 2379}
2192 2380
2193sub set_value { 2381sub set_value {
2194 my ($self, $value) = @_; 2382 my ($self, $value) = @_;
2195 2383
… …
2206 if $unit; 2394 if $unit;
2207 2395
2208 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2396 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2209 2397
2210 if ($value != $old_value) { 2398 if ($value != $old_value) {
2211 $self->_emit (changed => $value); 2399 $self->emit (changed => $value);
2212 $self->update; 2400 $self->update;
2213 } 2401 }
2214} 2402}
2215 2403
2216sub size_request { 2404sub size_request {
2217 my ($self) = @_; 2405 my ($self) = @_;
2218 2406
2219 ($self->{req_w}, $self->{req_h}) 2407 ($self->{req_w}, $self->{req_h})
2220} 2408}
2221 2409
2222sub button_down { 2410sub invoke_button_down {
2223 my ($self, $ev, $x, $y) = @_; 2411 my ($self, $ev, $x, $y) = @_;
2224 2412
2225 $self->SUPER::button_down ($ev, $x, $y); 2413 $self->SUPER::invoke_button_down ($ev, $x, $y);
2226 2414
2227 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2415 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2228 2416
2229 $self->mouse_motion ($ev, $x, $y); 2417 $self->invoke_mouse_motion ($ev, $x, $y)
2230} 2418}
2231 2419
2232sub mouse_motion { 2420sub invoke_mouse_motion {
2233 my ($self, $ev, $x, $y) = @_; 2421 my ($self, $ev, $x, $y) = @_;
2234 2422
2235 if ($GRAB == $self) { 2423 if ($GRAB == $self) {
2236 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2424 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2237 2425
2238 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2426 my (undef, $lo, $hi, $page) = @{$self->{range}};
2239 2427
2240 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2428 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2241 2429
2242 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2430 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2431 } else {
2432 return 0;
2433 }
2434
2243 } 2435 1
2244} 2436}
2245 2437
2246sub update { 2438sub update {
2247 my ($self) = @_; 2439 my ($self) = @_;
2248 2440
2249 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2441 delete $self->{knob_w};
2442 $self->SUPER::update;
2443}
2444
2445sub _draw {
2446 my ($self) = @_;
2447
2448 unless ($self->{knob_w}) {
2250 $self->set_value ($self->{range}[0]); 2449 $self->set_value ($self->{range}[0]);
2251 2450
2252 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2451 my ($value, $lo, $hi, $page) = @{$self->{range}};
2253 my $range = ($hi - $page - $lo) || 1e-100; 2452 my $range = ($hi - $page - $lo) || 1e-100;
2254 2453
… …
2260 $value = ($value - $lo) / $range; 2459 $value = ($value - $lo) / $range;
2261 $value = $value * $self->{scale} + $self->{offset}; 2460 $value = $value * $self->{scale} + $self->{offset};
2262 2461
2263 $self->{knob_x} = $value - $knob_w * 0.5; 2462 $self->{knob_x} = $value - $knob_w * 0.5;
2264 $self->{knob_w} = $knob_w; 2463 $self->{knob_w} = $knob_w;
2265 }); 2464 }
2266
2267 $self->SUPER::update;
2268}
2269
2270sub _draw {
2271 my ($self) = @_;
2272 2465
2273 $self->SUPER::_draw (); 2466 $self->SUPER::_draw ();
2274 2467
2275 glScale $self->{w}, $self->{h}; 2468 glScale $self->{w}, $self->{h};
2276 2469
… …
2337sub set_range { shift->{slider}->set_range (@_) } 2530sub set_range { shift->{slider}->set_range (@_) }
2338sub set_value { shift->{slider}->set_value (@_) } 2531sub set_value { shift->{slider}->set_value (@_) }
2339 2532
2340############################################################################# 2533#############################################################################
2341 2534
2342package CFClient::UI::TextView; 2535package CFClient::UI::TextScroller;
2343 2536
2344our @ISA = CFClient::UI::HBox::; 2537our @ISA = CFClient::UI::HBox::;
2345 2538
2346use CFClient::OpenGL; 2539use CFClient::OpenGL;
2347 2540
… …
2349 my $class = shift; 2542 my $class = shift;
2350 2543
2351 my $self = $class->SUPER::new ( 2544 my $self = $class->SUPER::new (
2352 fontsize => 1, 2545 fontsize => 1,
2353 can_events => 0, 2546 can_events => 0,
2547 indent => 0,
2354 #font => default_font 2548 #font => default_font
2355 @_, 2549 @_,
2356 2550
2357 layout => (new CFClient::Layout 1), 2551 layout => (new CFClient::Layout 1),
2358 par => [], 2552 par => [],
… …
2373 2567
2374 $self->{fontsize} = $fontsize; 2568 $self->{fontsize} = $fontsize;
2375 $self->reflow; 2569 $self->reflow;
2376} 2570}
2377 2571
2572sub visible_children {
2573 my ($self) = @_;
2574
2575 @{$self->{children}}[0,1]
2576}
2577
2378sub size_allocate { 2578sub invoke_size_allocate {
2379 my ($self, $w, $h, $changed) = @_; 2579 my ($self, $w, $h) = @_;
2380 2580
2381 $self->SUPER::size_allocate ($w, $h, $changed); 2581 my (undef, undef, @other) = @{ $self->{children} };
2382 2582 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2383 return unless $changed;
2384 2583
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2584 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2585 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2586 $self->{layout}->set_width ($self->{children}[0]{w});
2587 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2588
2389 $self->reflow; 2589 $self->reflow;
2390}
2391 2590
2392sub text_size { 2591 $self->SUPER::invoke_size_allocate ($w, $h)
2393 my ($self, $text, $indent) = @_; 2592}
2593
2594sub get_layout {
2595 my ($self, $para) = @_;
2394 2596
2395 my $layout = $self->{layout}; 2597 my $layout = $self->{layout};
2396 2598
2599 $layout->set_font ($self->{font}) if $self->{font};
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2600 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2601 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2602 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2603 $layout->set_markup ($para->{markup});
2400 2604 $layout->set_shapes (map +($_->{req_w}, $_->{req_h}), @{$para->{widget}});
2605
2401 $layout->size 2606 $layout
2402} 2607}
2403 2608
2404sub reflow { 2609sub reflow {
2405 my ($self) = @_; 2610 my ($self) = @_;
2406 2611
… …
2415 $self->{children}[1]->set_value ($offset); 2620 $self->{children}[1]->set_value ($offset);
2416} 2621}
2417 2622
2418sub clear { 2623sub clear {
2419 my ($self) = @_; 2624 my ($self) = @_;
2625
2626 my (undef, undef, @other) = @{ $self->{children} };
2627 $self->remove ($_) for @other;
2420 2628
2421 $self->{par} = []; 2629 $self->{par} = [];
2422 $self->{height} = 0; 2630 $self->{height} = 0;
2423 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 2631 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2424} 2632}
2425 2633
2426sub add_paragraph { 2634sub add_paragraph {
2427 my ($self, $color, $text, $indent) = @_; 2635 my ($self, $color, $para, $indent) = @_;
2428 2636
2429 for my $line (split /\n/, $text) { 2637 my ($text, @w) = ref $para ? @$para : $para;
2430 my ($w, $h) = $self->text_size ($line); 2638
2431 $self->{height} += $h; 2639 $para = {
2432 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 2640 w => 1e10,
2641 wrapped => 1,
2642 fg => $color,
2643 indent => $indent,
2644 markup => $text,
2645 widget => \@w,
2433 } 2646 };
2434 2647
2435 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 2648 $self->add (@w) if @w;
2649 push @{$self->{par}}, $para;
2650
2651 $self->{need_reflow}++;
2652 $self->update;
2653}
2654
2655sub scroll_to_bottom {
2656 my ($self) = @_;
2657
2658 $self->{scroll_to_bottom} = 1;
2659 $self->update;
2436} 2660}
2437 2661
2438sub update { 2662sub update {
2439 my ($self) = @_; 2663 my ($self) = @_;
2440 2664
… …
2442 2666
2443 return unless $self->{h} > 0; 2667 return unless $self->{h} > 0;
2444 2668
2445 delete $self->{texture}; 2669 delete $self->{texture};
2446 2670
2447 $ROOT->on_post_alloc ($self, sub { 2671 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2672 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2673
2450 if (delete $self->{need_reflow}) { 2674 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2675 my $height = 0;
2452 2676
2453 my $layout = $self->{layout};
2454
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456
2457 for (@{$self->{par}}) { 2677 for my $para (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2678 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2459 $layout->set_width ($W - $_->[3]); 2679 my $layout = $self->get_layout ($para);
2460 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2680 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2681
2682 $para->{w} = $w + $para->{indent};
2463 $_->[1] = $h; 2683 $para->{h} = $h;
2684 $para->{wrapped} = $layout->has_wrapped;
2464 } 2685 }
2465 2686
2466 $height += $_->[1]; 2687 $height += $para->{h};
2467 } 2688 }
2468 2689
2469 $self->{height} = $height; 2690 $self->{height} = $height;
2470 2691
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2692 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2472 2693
2473 delete $self->{texture}; 2694 delete $self->{texture};
2474 } 2695 }
2475 2696
2697 if (delete $self->{scroll_to_bottom}) {
2698 $self->{children}[1]->set_value (1e10);
2699 }
2700
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2701 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2702 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2703 glClear GL_COLOR_BUFFER_BIT;
2479 2704
2480 my $top = int $self->{children}[1]{range}[0]; 2705 my $top = int $self->{children}[1]{range}[0];
2481 2706
2482 my $y0 = $top; 2707 my $y0 = $top;
2483 my $y1 = $top + $H; 2708 my $y1 = $top + $H;
2484 2709
2485 my $y = 0; 2710 my $y = 0;
2486
2487 my $layout = $self->{layout};
2488
2489 $layout->set_font ($self->{font}) if $self->{font};
2490 2711
2491 glEnable GL_BLEND; 2712 glEnable GL_BLEND;
2492 #TODO# not correct in windows where rgba is forced off 2713 #TODO# not correct in windows where rgba is forced off
2493 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2714 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2494 2715
2495 for my $par (@{$self->{par}}) { 2716 for my $para (@{$self->{par}}) {
2496 my $h = $par->[1]; 2717 my $h = $para->{h};
2497 2718
2498 if ($y0 < $y + $h && $y < $y1) { 2719 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 2720
2500 $layout->set_width ($W - $par->[3]); 2721 my $layout = $self->get_layout ($para);
2501 $layout->set_markup ($par->[4]);
2502 2722
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2723 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2504 2724
2505 glRasterPos $par->[3], $y - $y0; 2725 glRasterPos $para->{indent}, $y - $y0;
2506 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2726 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2727
2728 if (my @w = @{ $para->{widget} }) {
2729 my @s = $layout->get_shapes;
2730
2731 for (@w) {
2732 my ($dx, $dy) = splice @s, 0, 2, ();
2733
2734 $_->{x} = $dx + $para->{indent};
2735 $_->{y} = $dy + $y - $y0;
2736
2737 $_->draw;
2738 }
2739 }
2507 } 2740 }
2508 2741
2509 $y += $h; 2742 $y += $h;
2510 } 2743 }
2511 2744
2512 glDisable GL_BLEND; 2745 glDisable GL_BLEND;
2513 }; 2746 };
2514 }); 2747 });
2515} 2748}
2516 2749
2750sub reconfigure {
2751 my ($self) = @_;
2752
2753 $self->SUPER::reconfigure;
2754
2755 $_->{w} = 1e10 for @{ $self->{par} };
2756 $self->reflow;
2757}
2758
2517sub _draw { 2759sub _draw {
2518 my ($self) = @_; 2760 my ($self) = @_;
2519 2761
2520 glEnable GL_TEXTURE_2D; 2762 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2764 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2765 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2766 glDisable GL_TEXTURE_2D;
2525 2767
2526 $self->{children}[1]->draw; 2768 $self->{children}[1]->draw;
2527
2528} 2769}
2529 2770
2530############################################################################# 2771#############################################################################
2531 2772
2532package CFClient::UI::Animator; 2773package CFClient::UI::Animator;
… …
2611} 2852}
2612 2853
2613sub set_tooltip_from { 2854sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2855 my ($self, $widget) = @_;
2615 2856
2857 my $tooltip = $widget->{tooltip};
2858
2859 if ($ENV{CFPLUS_DEBUG} & 2) {
2860 $tooltip .= "\n\n" . (ref $widget) . "\n"
2861 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2862 . "req $widget->{req_w} $widget->{req_h}\n"
2863 . "visible $widget->{visible}";
2864 }
2865
2866 $tooltip =~ s/^\n+//;
2867 $tooltip =~ s/\n+$//;
2868
2616 $self->add (new CFClient::UI::Label 2869 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2870 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2871 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2872 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2873 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2874 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2875 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2882 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2630 2883
2631 ($w + 4, $h + 4) 2884 ($w + 4, $h + 4)
2632} 2885}
2633 2886
2634sub size_allocate { 2887sub invoke_size_allocate {
2635 my ($self, $w, $h, $changed) = @_; 2888 my ($self, $w, $h) = @_;
2636 2889
2637 return unless $changed;
2638
2639 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2890 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2640} 2891}
2641 2892
2642sub visibility_change { 2893sub invoke_visibility_change {
2643 my ($self, $visible) = @_; 2894 my ($self, $visible) = @_;
2644 2895
2645 return unless $visible; 2896 return unless $visible;
2646 2897
2647 $self->{root}->on_post_alloc ("move_$self" => sub { 2898 $self->{root}->on_post_alloc ("move_$self" => sub {
… …
2649 or return; 2900 or return;
2650 2901
2651 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2902 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2652 2903
2653 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2904 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2654 if $x + $self->{w} > $::WIDTH; 2905 if $x + $self->{w} > $self->{root}{w};
2655 2906
2656 $self->move_abs ($x, $y); 2907 $self->move_abs ($x, $y);
2657 }); 2908 });
2658} 2909}
2659 2910
… …
2748 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2999 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2749 3000
2750 if ($tex) { 3001 if ($tex) {
2751 glEnable GL_TEXTURE_2D; 3002 glEnable GL_TEXTURE_2D;
2752 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3003 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2753 glColor 1, 1, 1, 1; 3004 glColor 0, 0, 0, 1;
2754 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3005 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2755 glDisable GL_TEXTURE_2D; 3006 glDisable GL_TEXTURE_2D;
2756 } 3007 }
2757} 3008}
2758 3009
2759sub DESTROY { 3010sub destroy {
2760 my ($self) = @_; 3011 my ($self) = @_;
2761 3012
2762 $self->{timer}->cancel 3013 $self->{timer}->cancel
2763 if $self->{timer}; 3014 if $self->{timer};
2764 3015
2765 $self->SUPER::DESTROY; 3016 $self->SUPER::destroy;
2766} 3017}
2767 3018
2768############################################################################# 3019#############################################################################
2769 3020
2770package CFClient::UI::Inventory; 3021package CFClient::UI::Buttonbar;
2771 3022
2772our @ISA = CFClient::UI::ScrolledWindow::; 3023our @ISA = CFClient::UI::HBox::;
2773 3024
2774sub new { 3025# TODO: should actualyl wrap buttons and other goodies.
2775 my $class = shift;
2776
2777 my $self = $class->SUPER::new (
2778 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2779 @_,
2780 );
2781
2782 $self
2783}
2784
2785sub set_items {
2786 my ($self, $items) = @_;
2787
2788 $self->{scrolled}->clear;
2789 return unless $items;
2790
2791 my @items = sort {
2792 ($a->{type} <=> $b->{type})
2793 or ($a->{name} cmp $b->{name})
2794 } @$items;
2795
2796 $self->{real_items} = \@items;
2797
2798 my $row = 0;
2799 for my $item (@items) {
2800 CFClient::Item::update_widgets $item;
2801
2802 $self->{scrolled}->add (0, $row, $item->{face_widget});
2803 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2804 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2805
2806 $row++;
2807 }
2808}
2809 3026
2810############################################################################# 3027#############################################################################
2811 3028
2812package CFClient::UI::Menu; 3029package CFClient::UI::Menu;
2813 3030
… …
2825 ); 3042 );
2826 3043
2827 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3044 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2828 3045
2829 for my $item (@{ $self->{items} }) { 3046 for my $item (@{ $self->{items} }) {
2830 my ($widget, $cb) = @$item; 3047 my ($widget, $cb, $tooltip) = @$item;
2831 3048
2832 # handle various types of items, only text for now 3049 # handle various types of items, only text for now
2833 if (!ref $widget) { 3050 if (!ref $widget) {
2834 $widget = new CFClient::UI::Label 3051 $widget = new CFClient::UI::Label
2835 can_hover => 1, 3052 can_hover => 1,
2836 can_events => 1, 3053 can_events => 1,
2837 text => $widget; 3054 markup => $widget,
3055 tooltip => $tooltip
2838 } 3056 }
2839 3057
2840 $self->{item}{$widget} = $item; 3058 $self->{item}{$widget} = $item;
2841 3059
2842 $self->{vbox}->add ($widget); 3060 $self->{vbox}->add ($widget);
… …
2847 3065
2848# popup given the event (must be a mouse button down event currently) 3066# popup given the event (must be a mouse button down event currently)
2849sub popup { 3067sub popup {
2850 my ($self, $ev) = @_; 3068 my ($self, $ev) = @_;
2851 3069
2852 $self->_emit ("popdown"); 3070 $self->emit ("popdown");
2853 3071
2854 # maybe save $GRAB? must be careful about events... 3072 # maybe save $GRAB? must be careful about events...
2855 $GRAB = $self; 3073 $GRAB = $self;
2856 $self->{button} = $ev->{button}; 3074 $self->{button} = $ev->{button};
2857 3075
2858 $self->show; 3076 $self->show;
2859 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3077 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2860} 3078}
2861 3079
2862sub mouse_motion { 3080sub invoke_mouse_motion {
2863 my ($self, $ev, $x, $y) = @_; 3081 my ($self, $ev, $x, $y) = @_;
2864 3082
2865 # TODO: should use vbox->find_widget or so 3083 # TODO: should use vbox->find_widget or so
2866 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3084 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2867 $self->{hover} = $self->{item}{$HOVER}; 3085 $self->{hover} = $self->{item}{$HOVER};
2868}
2869 3086
3087 0
3088}
3089
2870sub button_up { 3090sub invoke_button_up {
2871 my ($self, $ev, $x, $y) = @_; 3091 my ($self, $ev, $x, $y) = @_;
2872 3092
2873 if ($ev->{button} == $self->{button}) { 3093 if ($ev->{button} == $self->{button}) {
2874 undef $GRAB; 3094 undef $GRAB;
2875 $self->hide; 3095 $self->hide;
2876 3096
2877 $self->_emit ("popdown"); 3097 $self->emit ("popdown");
2878 $self->{hover}[1]->() if $self->{hover}; 3098 $self->{hover}[1]->() if $self->{hover};
3099 } else {
3100 return 0
3101 }
3102
2879 } 3103 1
2880} 3104}
2881 3105
2882############################################################################# 3106#############################################################################
2883 3107
2884package CFClient::UI::Statusbox; 3108package CFClient::UI::Multiplexer;
2885 3109
2886our @ISA = CFClient::UI::VBox::; 3110our @ISA = CFClient::UI::Container::;
2887 3111
2888sub new { 3112sub new {
2889 my $class = shift; 3113 my $class = shift;
2890 3114
2891 $class->SUPER::new ( 3115 my $self = $class->SUPER::new (
3116 @_,
3117 );
3118
3119 $self->{current} = $self->{children}[0]
3120 if @{ $self->{children} };
3121
3122 $self
3123}
3124
3125sub add {
3126 my ($self, @widgets) = @_;
3127
3128 $self->SUPER::add (@widgets);
3129
3130 $self->{current} = $self->{children}[0]
3131 if @{ $self->{children} };
3132}
3133
3134sub set_current_page {
3135 my ($self, $page_or_widget) = @_;
3136
3137 my $widget = ref $page_or_widget
3138 ? $page_or_widget
3139 : $self->{children}[$page_or_widget];
3140
3141 $self->{current} = $widget;
3142 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3143
3144 $self->emit (page_changed => $self->{current});
3145
3146 $self->realloc;
3147}
3148
3149sub visible_children {
3150 $_[0]{current}
3151}
3152
3153sub size_request {
3154 my ($self) = @_;
3155
3156 $self->{current}->size_request
3157}
3158
3159sub invoke_size_allocate {
3160 my ($self, $w, $h) = @_;
3161
3162 $self->{current}->configure (0, 0, $w, $h);
3163
3164 1
3165}
3166
3167sub _draw {
3168 my ($self) = @_;
3169
3170 $self->{current}->draw;
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Notebook;
3176
3177our @ISA = CFClient::UI::VBox::;
3178
3179sub new {
3180 my $class = shift;
3181
3182 my $self = $class->SUPER::new (
3183 buttonbar => (new CFClient::UI::Buttonbar),
3184 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3185 # filter => # will be put between multiplexer and $self
3186 @_,
3187 );
3188
3189 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3190 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3191
3192 $self
3193}
3194
3195sub add {
3196 my ($self, $title, $widget, $tooltip) = @_;
3197
3198 Scalar::Util::weaken $self;
3199
3200 $self->{buttonbar}->add (new CFClient::UI::Button
3201 markup => $title,
3202 tooltip => $tooltip,
3203 on_activate => sub { $self->set_current_page ($widget) },
3204 );
3205
3206 $self->{multiplexer}->add ($widget);
3207}
3208
3209sub set_current_page {
3210 my ($self, $page) = @_;
3211
3212 $self->{multiplexer}->set_current_page ($page);
3213 $self->emit (page_changed => $self->{multiplexer}{current});
3214}
3215
3216#############################################################################
3217
3218package CFClient::UI::Combobox;
3219
3220use utf8;
3221
3222our @ISA = CFClient::UI::Button::;
3223
3224sub new {
3225 my $class = shift;
3226
3227 my $self = $class->SUPER::new (
3228 options => [], # [value, title, longdesc], ...
3229 value => undef,
3230 @_,
3231 );
3232
3233 $self->_set_value ($self->{value});
3234
3235 $self
3236}
3237
3238sub invoke_button_down {
3239 my ($self, $ev) = @_;
3240
3241 my @menu_items;
3242
3243 for (@{ $self->{options} }) {
3244 my ($value, $title, $tooltip) = @$_;
3245
3246 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3247 }
3248
3249 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3250}
3251
3252sub _set_value {
3253 my ($self, $value) = @_;
3254
3255 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3256 or return;
3257
3258 $self->{value} = $item->[0];
3259 $self->set_markup ("$item->[1] ⇓");
3260 $self->set_tooltip ($item->[2]);
3261}
3262
3263sub set_value {
3264 my ($self, $value) = @_;
3265
3266 return unless $self->{value} ne $value;
3267
3268 $self->_set_value ($value);
3269 $self->emit (changed => $value);
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::Statusbox;
3275
3276our @ISA = CFClient::UI::VBox::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (
2892 fontsize => 0.8, 3282 fontsize => 0.8,
2893 @_, 3283 @_,
2894 ) 3284 );
3285
3286 Scalar::Util::weaken (my $this = $self);
3287
3288 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3289
3290 $self
2895} 3291}
2896 3292
2897sub reorder { 3293sub reorder {
2898 my ($self) = @_; 3294 my ($self) = @_;
2899 my $NOW = time; 3295 my $NOW = Time::HiRes::time;
3296
3297 # freeze display when hovering over any label
3298 return if $CFClient::UI::TOOLTIP->{owner}
3299 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3300 values %{ $self->{item} };
2900 3301
2901 while (my ($k, $v) = each %{ $self->{item} }) { 3302 while (my ($k, $v) = each %{ $self->{item} }) {
2902 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3303 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2903 } 3304 }
2904 3305
… …
2907 my @items = sort { 3308 my @items = sort {
2908 $a->{pri} <=> $b->{pri} 3309 $a->{pri} <=> $b->{pri}
2909 or $b->{id} <=> $a->{id} 3310 or $b->{id} <=> $a->{id}
2910 } values %{ $self->{item} }; 3311 } values %{ $self->{item} };
2911 3312
3313 $self->{timer}->interval (1);
3314
2912 my $count = 10 + 1; 3315 my $count = 10 + 1;
2913 for my $item (@items) { 3316 for my $item (@items) {
2914 last unless --$count; 3317 last unless --$count;
2915 3318
2916 push @widgets, $item->{label} ||= do { 3319 my $label = $item->{label} ||= do {
2917 # TODO: doesn't handle markup well (read as: at all) 3320 # TODO: doesn't handle markup well (read as: at all)
2918 my $short = $item->{count} > 1 3321 my $short = $item->{count} > 1
2919 ? "<b>$item->{count} ×</b> $item->{text}" 3322 ? "<b>$item->{count} ×</b> $item->{text}"
2920 : $item->{text}; 3323 : $item->{text};
2921 3324
… …
2929 tooltip => $item->{tooltip}, 3332 tooltip => $item->{tooltip},
2930 tooltip_font => $::FONT_PROP, 3333 tooltip_font => $::FONT_PROP,
2931 tooltip_width => 0.67, 3334 tooltip_width => 0.67,
2932 fontsize => $item->{fontsize} || $self->{fontsize}, 3335 fontsize => $item->{fontsize} || $self->{fontsize},
2933 max_w => $::WIDTH * 0.44, 3336 max_w => $::WIDTH * 0.44,
2934 fg => $item->{fg}, 3337 fg => [@{ $item->{fg} }],
2935 can_events => 1, 3338 can_events => 1,
2936 can_hover => 1 3339 can_hover => 1
2937 }; 3340 };
3341
3342 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3343 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3344 $label->update;
3345 $label->set_max_size (undef, $label->{req_h} * $diff)
3346 if $diff < 1;
3347 $self->{timer}->interval (1/30);
3348 } else {
3349 $label->{fg}[3] = $item->{fg}[3] || 1;
3350 }
3351
3352 push @widgets, $label;
2938 } 3353 }
2939 3354
2940 $self->clear; 3355 $self->clear;
2941 $self->SUPER::add (reverse @widgets); 3356 $self->SUPER::add (reverse @widgets);
2942} 3357}
… …
2947 $text =~ s/^\s+//; 3362 $text =~ s/^\s+//;
2948 $text =~ s/\s+$//; 3363 $text =~ s/\s+$//;
2949 3364
2950 return unless $text; 3365 return unless $text;
2951 3366
2952 my $timeout = time + ((delete $arg{timeout}) || 60); 3367 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2953 3368
2954 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3369 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2955 3370
2956 if (my $item = $self->{item}{$group}) { 3371 if (my $item = $self->{item}{$group}) {
2957 if ($item->{text} eq $text) { 3372 if ($item->{text} eq $text) {
2958 $item->{count}++; 3373 $item->{count}++;
2959 } else { 3374 } else {
2960 $item->{count} = 1; 3375 $item->{count} = 1;
2961 $item->{text} = $item->{tooltip} = $text; 3376 $item->{text} = $item->{tooltip} = $text;
2962 } 3377 }
2963 $item->{id} = ++$self->{id}; 3378 $item->{id} += 0.2;#d#
2964 $item->{timeout} = $timeout; 3379 $item->{timeout} = $timeout;
2965 delete $item->{label}; 3380 delete $item->{label};
2966 } else { 3381 } else {
2967 $self->{item}{$group} = { 3382 $self->{item}{$group} = {
2968 id => ++$self->{id}, 3383 id => ++$self->{id},
… …
2987 3402
2988 $self->reorder; 3403 $self->reorder;
2989 $self->SUPER::reconfigure; 3404 $self->SUPER::reconfigure;
2990} 3405}
2991 3406
3407sub destroy {
3408 my ($self) = @_;
3409
3410 $self->{timer}->cancel;
3411
3412 $self->SUPER::destroy;
3413}
3414
2992############################################################################# 3415#############################################################################
2993 3416
3417package CFClient::UI::Inventory;
3418
3419our @ISA = CFClient::UI::ScrolledWindow::;
3420
3421sub new {
3422 my $class = shift;
3423
3424 my $self = $class->SUPER::new (
3425 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3426 @_,
3427 );
3428
3429 $self
3430}
3431
3432sub set_items {
3433 my ($self, $items) = @_;
3434
3435 $self->{child}->clear;
3436 return unless $items;
3437
3438 my @items = sort {
3439 ($a->{type} <=> $b->{type})
3440 or ($a->{name} cmp $b->{name})
3441 } @$items;
3442
3443 $self->{real_items} = \@items;
3444
3445 my $row = 0;
3446 for my $item (@items) {
3447 CFClient::Item::update_widgets $item;
3448
3449 $self->{child}->add (0, $row, $item->{face_widget});
3450 $self->{child}->add (1, $row, $item->{desc_widget});
3451 $self->{child}->add (2, $row, $item->{weight_widget});
3452
3453 $row++;
3454 }
3455}
3456
3457#############################################################################
3458
3459package CFClient::UI::BindEditor;
3460
3461our @ISA = CFClient::UI::FancyFrame::;
3462
3463sub new {
3464 my $class = shift;
3465
3466 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3467
3468 $self->add (my $vb = new CFClient::UI::VBox);
3469
3470
3471 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3472 text => "start recording",
3473 tooltip => "Start/Stops recording of actions."
3474 ."All subsequent actions after the recording started will be captured."
3475 ."The actions are displayed after the record was stopped."
3476 ."To bind the action you have to click on the 'Bind' button",
3477 on_activate => sub {
3478 unless ($self->{recording}) {
3479 $self->start;
3480 } else {
3481 $self->stop;
3482 }
3483 });
3484
3485 $vb->add (new CFClient::UI::Label text => "Actions:");
3486 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3487
3488 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3489 $vb->add (my $hb = new CFClient::UI::HBox);
3490 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3491 $hb->add (new CFClient::UI::Button
3492 text => "bind",
3493 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3494 on_activate => sub {
3495 $self->ask_for_bind;
3496 });
3497
3498 $vb->add (my $hb = new CFClient::UI::HBox);
3499 $hb->add (new CFClient::UI::Button
3500 text => "ok",
3501 expand => 1,
3502 tooltip => "This closes the binding editor and saves the binding",
3503 on_activate => sub {
3504 $self->hide;
3505 $self->commit;
3506 });
3507
3508 $hb->add (new CFClient::UI::Button
3509 text => "cancel",
3510 expand => 1,
3511 tooltip => "This closes the binding editor without saving",
3512 on_activate => sub {
3513 $self->hide;
3514 $self->{binding_cancel}->()
3515 if $self->{binding_cancel};
3516 });
3517
3518 $self->update_binding_widgets;
3519
3520 $self
3521}
3522
3523sub cfg_bind {
3524 my ($self, $mod, $sym, $cmds) = @_;
3525 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3526 ::update_bindings ();
3527}
3528
3529sub cfg_unbind {
3530 my ($self, $mod, $sym, $cmds) = @_;
3531 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3532 ::update_bindings ();
3533}
3534
3535sub commit {
3536 my ($self) = @_;
3537 my ($mod, $sym, $cmds) = $self->get_binding;
3538 if ($sym != 0 && @$cmds > 0) {
3539 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3540 ."'. Don't forget 'Save Config'!");
3541 $self->{binding_change}->($mod, $sym, $cmds)
3542 if $self->{binding_change};
3543 } else {
3544 $::STATUSBOX->add ("No action bound, no key or action specified!");
3545 $self->{binding_cancel}->()
3546 if $self->{binding_cancel};
3547 }
3548}
3549
3550sub start {
3551 my ($self) = @_;
3552
3553 $self->{rec_btn}->set_text ("stop recording");
3554 $self->{recording} = 1;
3555 $self->clear_command_list;
3556 $::CONN->start_record if $::CONN;
3557}
3558
3559sub stop {
3560 my ($self) = @_;
3561
3562 $self->{rec_btn}->set_text ("start recording");
3563 $self->{recording} = 0;
3564
3565 my $rec;
3566 $rec = $::CONN->stop_record if $::CONN;
3567 return unless ref $rec eq 'ARRAY';
3568 $self->set_command_list ($rec);
3569}
3570
3571
3572sub ask_for_bind_and_commit {
3573 my ($self) = @_;
3574 $self->ask_for_bind (1);
3575}
3576
3577sub ask_for_bind {
3578 my ($self, $commit, $end_cb) = @_;
3579
3580 CFClient::Binder::open_binding_dialog (sub {
3581 my ($mod, $sym) = @_;
3582 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3583 $self->update_binding_widgets;
3584 $self->commit if $commit;
3585 $end_cb->() if $end_cb;
3586 });
3587}
3588
3589# $mod and $sym are the modifiers and key symbol
3590# $cmds is a array ref of strings (the commands)
3591# $cb is the callback that is executed on OK
3592# $ccb is the callback that is executed on CANCEL and
3593# when the binding was unsuccessful on OK
3594sub set_binding {
3595 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3596
3597 $self->clear_command_list;
3598 $self->{recording} = 0;
3599 $self->{rec_btn}->set_text ("start recording");
3600
3601 $self->{binding} = [$mod, $sym];
3602 $self->{commands} = $cmds;
3603
3604 $self->{binding_change} = $cb;
3605 $self->{binding_cancel} = $ccb;
3606
3607 $self->update_binding_widgets;
3608}
3609
3610# this is a shortcut method that asks for a binding
3611# and then just binds it.
3612sub do_quick_binding {
3613 my ($self, $cmds, $end_cb) = @_;
3614 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3615 $self->ask_for_bind (1, $end_cb);
3616}
3617
3618sub update_binding_widgets {
3619 my ($self) = @_;
3620 my ($mod, $sym, $cmds) = $self->get_binding;
3621 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3622 $self->set_command_list ($cmds);
3623}
3624
3625sub get_binding {
3626 my ($self) = @_;
3627 return (
3628 $self->{binding}->[0],
3629 $self->{binding}->[1],
3630 [ grep { defined $_ } @{$self->{commands}} ]
3631 );
3632}
3633
3634sub clear_command_list {
3635 my ($self) = @_;
3636 $self->{cmdbox}->clear ();
3637}
3638
3639sub set_command_list {
3640 my ($self, $cmds) = @_;
3641
3642 $self->{cmdbox}->clear ();
3643 $self->{commands} = $cmds;
3644
3645 my $idx = 0;
3646
3647 for (@$cmds) {
3648 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3649
3650 my $i = $idx;
3651 $hb->add (new CFClient::UI::Label text => $_);
3652 $hb->add (new CFClient::UI::Button
3653 text => "delete",
3654 tooltip => "Deletes the action from the record",
3655 on_activate => sub {
3656 $self->{cmdbox}->remove ($hb);
3657 $cmds->[$i] = undef;
3658 });
3659
3660
3661 $idx++
3662 }
3663}
3664
3665#############################################################################
3666
3667package CFClient::UI::SpellList;
3668
3669our @ISA = CFClient::UI::Table::;
3670
3671sub new {
3672 my $class = shift;
3673
3674 my $self = $class->SUPER::new (
3675 binding => [],
3676 commands => [],
3677 @_,
3678 )
3679}
3680
3681my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3682
3683my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3684 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3685my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3686 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3687my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3691my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3693
3694sub rebuild_spell_list {
3695 my ($self) = @_;
3696
3697 $CFClient::UI::ROOT->on_refresh ($self => sub {
3698 $self->clear;
3699
3700 return unless $::CONN;
3701
3702 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3703 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3704 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3705 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3706 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3707
3708 my $row = 0;
3709
3710 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3711 my $spell = $self->{spell}{$_};
3712
3713 $row++;
3714
3715 my $spell_cb = sub {
3716 my ($widget, $ev) = @_;
3717
3718 if ($ev->{button} == 1) {
3719 $::CONN->user_send ("cast $spell->{name}");
3720 } elsif ($ev->{button} == 2) {
3721 $::CONN->user_send ("invoke $spell->{name}");
3722 } elsif ($ev->{button} == 3) {
3723 (new CFClient::UI::Menu
3724 items => [
3725 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3726 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3727 ],
3728 )->popup ($ev);
3729 } else {
3730 return 0;
3731 }
3732
3733 1
3734 };
3735
3736 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3737
3738 #TODO: add path info to tooltip
3739 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3740
3741 $self->add (0, $row, new CFClient::UI::Face
3742 face => $spell->{face},
3743 can_hover => 1,
3744 can_events => 1,
3745 tooltip => $tooltip,
3746 on_button_down => $spell_cb,
3747 );
3748
3749 $self->add (1, $row, new CFClient::UI::Label
3750 expand => 1,
3751 text => $spell->{name},
3752 can_hover => 1,
3753 can_events => 1,
3754 tooltip => $tooltip,
3755 on_button_down => $spell_cb,
3756 );
3757
3758 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3759 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3760 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3761 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3762 }
3763 });
3764}
3765
3766sub add_spell {
3767 my ($self, $spell) = @_;
3768
3769 $self->{spell}->{$spell->{name}} = $spell;
3770 $self->rebuild_spell_list;
3771}
3772
3773sub remove_spell {
3774 my ($self, $spell) = @_;
3775
3776 delete $self->{spell}->{$spell->{name}};
3777 $self->rebuild_spell_list;
3778}
3779
3780sub clear_spells {
3781 my ($self) = @_;
3782
3783 $self->{spell} = {};
3784 $self->rebuild_spell_list;
3785}
3786
3787#############################################################################
3788
2994package CFClient::UI::Root; 3789package CFClient::UI::Root;
2995 3790
2996our @ISA = CFClient::UI::Container::; 3791our @ISA = CFClient::UI::Container::;
3792
3793use List::Util qw(min max);
2997 3794
2998use CFClient::OpenGL; 3795use CFClient::OpenGL;
2999 3796
3000sub new { 3797sub new {
3001 my $class = shift; 3798 my $class = shift;
… …
3008 Scalar::Util::weaken ($self->{root} = $self); 3805 Scalar::Util::weaken ($self->{root} = $self);
3009 3806
3010 $self 3807 $self
3011} 3808}
3012 3809
3013sub configure {
3014 my ($self, $x, $y, $w, $h) = @_;
3015
3016 $self->{w} = $w;
3017 $self->{h} = $h;
3018}
3019
3020sub reconfigure {
3021 my ($self) = @_;
3022
3023 $self->SUPER::reconfigure;
3024
3025 $self->size_allocate ($self->{w}, $self->{h}, 1)
3026 if $self->{w};
3027}
3028
3029sub size_request { 3810sub size_request {
3030 my ($self) = @_; 3811 my ($self) = @_;
3031 3812
3032 ($self->{w}, $self->{h}) 3813 ($self->{w}, $self->{h})
3033} 3814}
… …
3044 $coord = $max - $size if $coord > $max - $size; 3825 $coord = $max - $size if $coord > $max - $size;
3045 3826
3046 int $coord + 0.5 3827 int $coord + 0.5
3047} 3828}
3048 3829
3049sub size_allocate { 3830sub invoke_size_allocate {
3050 my ($self, $w, $h, $changed) = @_; 3831 my ($self, $w, $h) = @_;
3051 3832
3052 for my $child ($self->children) { 3833 for my $child ($self->children) {
3053 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3834 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3054 3835
3055 $X = $child->{force_x} if exists $child->{force_x}; 3836 $X = $child->{force_x} if exists $child->{force_x};
… …
3058 $X = _to_pixel $X, $W, $self->{w}; 3839 $X = _to_pixel $X, $W, $self->{w};
3059 $Y = _to_pixel $Y, $H, $self->{h}; 3840 $Y = _to_pixel $Y, $H, $self->{h};
3060 3841
3061 $child->configure ($X, $Y, $W, $H); 3842 $child->configure ($X, $Y, $W, $H);
3062 } 3843 }
3844
3845 1
3063} 3846}
3064 3847
3065sub coord2local { 3848sub coord2local {
3066 my ($self, $x, $y) = @_; 3849 my ($self, $x, $y) = @_;
3067 3850
… …
3123 $_->() 3906 $_->()
3124 for values %{delete $self->{refresh_hook}}; 3907 for values %{delete $self->{refresh_hook}};
3125 } 3908 }
3126 3909
3127 if ($self->{realloc}) { 3910 if ($self->{realloc}) {
3911 my %queue;
3128 my @queue; 3912 my @queue;
3913 my $widget;
3129 3914
3915 outer:
3130 while () { 3916 while () {
3131 if ($self->{realloc}) { 3917 if (my $realloc = delete $self->{realloc}) {
3132 #TODO use array-of-depth approach 3918 for $widget (values %$realloc) {
3919 $widget->{visible} or next; # do not resize invisible widgets
3133 3920
3134 @queue = sort { $a->{visible} <=> $b->{visible} } 3921 $queue{$widget+0}++ and next; # duplicates are common
3135 @queue, values %{delete $self->{realloc}}; 3922
3923 push @{ $queue[$widget->{visible}] }, $widget;
3924 }
3136 } 3925 }
3137 3926
3927 while () {
3928 @queue or last outer;
3929
3138 my $widget = pop @queue || last; 3930 $widget = pop @{ $queue[-1] || [] }
3931 and last;
3932
3933 pop @queue;
3934 }
3139 3935
3140 $widget->{visible} or last; # do not resize invisible widgets 3936 delete $queue{$widget+0};
3141 3937
3142 my ($w, $h) = $widget->size_request; 3938 my ($w, $h) = $widget->size_request;
3143 3939
3144 my $min_size = $widget->{is_toplevel} ? 16 : 0; 3940 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3941 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3145 3942
3146 $w = List::Util::max $widget->{min_w} || $widget->{is_toplevel} * 16, $w; 3943 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3147 $h = List::Util::max $widget->{min_h} || $widget->{is_toplevel} * 16, $h; 3944 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3148 3945
3149 $w = $widget->{force_w} if exists $widget->{force_w}; 3946 $w = $widget->{force_w} if exists $widget->{force_w};
3150 $h = $widget->{force_h} if exists $widget->{force_h}; 3947 $h = $widget->{force_h} if exists $widget->{force_h};
3151 3948
3949 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3950 || delete $widget->{force_realloc}) {
3152 $widget->{req_w} = $w; 3951 $widget->{req_w} = $w;
3153 $widget->{req_h} = $h; 3952 $widget->{req_h} = $h;
3154 3953
3155 $self->{size_alloc}{$widget} = [$widget, undef, undef]; 3954 $self->{size_alloc}{$widget+0} = $widget;
3156 3955
3157 push @queue, $widget->{parent} 3956 if (my $parent = $widget->{parent}) {
3158 if ($self->{w} != $w || $self->{h} != $h) && $widget->{parent}; 3957 $self->{realloc}{$parent+0} = $parent
3958 unless $queue{$parent+0};
3959
3960 $parent->{force_size_alloc} = 1;
3961 $self->{size_alloc}{$parent+0} = $parent;
3962 }
3963 }
3964
3965 delete $self->{realloc}{$widget+0};
3159 } 3966 }
3160 } 3967 }
3161 3968
3162 while (my $size_alloc = delete $self->{size_alloc}) { 3969 while (my $size_alloc = delete $self->{size_alloc}) {
3163 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3970 my @queue = sort { $b->{visible} <=> $a->{visible} }
3164 values %$size_alloc; 3971 values %$size_alloc;
3165 3972
3166 while () { 3973 while () {
3167 my ($widget, $w, $h) = @{ pop @queue or last }; 3974 my $widget = pop @queue || last;
3168 3975
3169 $w = $widget->{w} || $widget->{req_w} unless defined $w; 3976 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3170 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3171 3977
3172 $w = 0 if $w < 0; 3978 $w = 0 if $w < 0;
3173 $h = 0 if $h < 0; 3979 $h = 0 if $h < 0;
3174 3980
3175 $w = int $w + 0.5; 3981 $w = int $w + 0.5;
3176 $h = int $h + 0.5; 3982 $h = int $h + 0.5;
3177 3983
3178 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3984 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3985 $widget->{old_w} = $widget->{w};
3986 $widget->{old_h} = $widget->{h};
3179 3987
3180 $widget->{w} = $w; 3988 $widget->{w} = $w;
3181 $widget->{h} = $h; 3989 $widget->{h} = $h;
3182 3990
3183 $widget->emit (size_allocate => $w, $h, $changed); 3991 $widget->emit (size_allocate => $w, $h);
3992 }
3184 } 3993 }
3185 } 3994 }
3186 3995
3187 while ($self->{post_alloc_hook}) { 3996 while ($self->{post_alloc_hook}) {
3188 $_->() 3997 $_->()
3189 for values %{delete $self->{post_alloc_hook}}; 3998 for values %{delete $self->{post_alloc_hook}};
3190 } 3999 }
4000
3191 4001
3192 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4002 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3193 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4003 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3194 glClear GL_COLOR_BUFFER_BIT; 4004 glClear GL_COLOR_BUFFER_BIT;
3195 4005
… …
3197 glLoadIdentity; 4007 glLoadIdentity;
3198 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4008 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3199 glMatrixMode GL_MODELVIEW; 4009 glMatrixMode GL_MODELVIEW;
3200 glLoadIdentity; 4010 glLoadIdentity;
3201 4011
4012 {
4013 package CFClient::UI::Base;
4014
4015 ($draw_x, $draw_y, $draw_w, $draw_h) =
4016 (0, 0, $self->{w}, $self->{h});
4017 }
4018
3202 $self->_draw; 4019 $self->_draw;
3203} 4020}
3204 4021
3205############################################################################# 4022#############################################################################
3206 4023

Diff Legend

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