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

Diff Legend

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