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.255 by root, Mon May 29 02:01:56 2006 UTC vs.
Revision 1.291 by root, Tue Jun 6 02:55:50 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
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $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};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $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};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
269 delete $self->{visible}; 278 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->focus_out;
278 287
279 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
303 312
304 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
305 if $self->{parent}; 314 if $self->{parent};
306} 315}
307 316
308sub move { 317sub move_abs {
309 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
310 319
311 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
314 323
315 $self->update; 324 $self->update;
316} 325}
317 326
318sub set_size { 327sub set_size {
319 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
320 329
321 $self->{def_w} = $w; 330 $self->{force_w} = $w;
322 $self->{def_h} = $h; 331 $self->{force_h} = $h;
323 332
324 $self->realloc; 333 $self->realloc;
325} 334}
326 335
327sub size_request { 336sub size_request {
… …
331 340
332sub configure { 341sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
334 343
335 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
338 349
339 # use alignment to adjust x, y 350 # use alignment to adjust x, y
340 351
341 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 354 }
346 355
347 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 357 $self->{x} = $x;
349 $self->{y} = $y; 358 $self->{y} = $y;
350 $self->update; 359 $self->update;
351 } 360 }
352 361
353 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 363 return unless $self->{visible};
355 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
357 } 369 }
358} 370}
359 371
360sub size_allocate { 372sub size_allocate {
361 # nothing to be done 373 # nothing to be done
362} 374}
363 375
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449 464
450sub find_widget { 465sub find_widget {
451 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
452 467
453 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
461 476
462sub set_parent { 477sub set_parent {
463 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
464 479
465 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
468} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
492 506
493sub realloc { 507sub realloc {
494 my ($self) = @_; 508 my ($self) = @_;
495 509
496 if ($self->{visible}) { 510 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
498 512
499 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 514 $self->{root}->update;
501 } else { 515 } else {
502 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
503 } 518 }
504} 519}
505 520
506sub update { 521sub update {
507 my ($self) = @_; 522 my ($self) = @_;
508 523
509 $self->{parent}->update 524 $self->{parent}->update
510 if $self->{parent}; 525 if $self->{parent};
511} 526}
512 527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
513sub draw { 539sub draw {
514 my ($self) = @_; 540 my ($self) = @_;
515 541
516 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 553
518 glPushMatrix; 554 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 556
523 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 559 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 561 glBegin GL_QUADS;
530 glVertex $x , $y; 562 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
534 glEnd; 566 glEnd;
535 glDisable GL_BLEND; 567 glDisable GL_BLEND;
536 } 568 }
537 569
538 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 571 glPushMatrix;
540 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 575 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
547 glEnd; 579 glEnd;
548 glPopMatrix; 580 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
551} 586}
552 587
553sub _draw { 588sub _draw {
554 my ($self) = @_; 589 my ($self) = @_;
555 590
… …
593 628
594 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
596 631
597 glEnable GL_BLEND; 632 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 634 glColor_premultiply @$color;
600 635
601 glBegin GL_QUADS; 636 glBegin GL_QUADS;
602 glVertex 0 , 0; 637 glVertex 0 , 0;
603 glVertex 0 , $h; 638 glVertex 0 , $h;
604 glVertex $w, $h; 639 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
621} 656}
622 657
623sub size_request { 658sub size_request {
624 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
625} 662}
626 663
627sub draw { } 664sub draw { }
628 665
629############################################################################# 666#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
634 671
635sub new { 672sub new {
636 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
637 674
638 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
639 676
640 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
641 children => [], 678 children => [],
642 can_events => 0, 679 can_events => 0,
643 %arg, 680 %arg,
644 ); 681 );
682
645 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
646 685
647 $self 686 $self
648} 687}
649 688
650sub add { 689sub add {
… …
698 $x -= $self->{x}; 737 $x -= $self->{x};
699 $y -= $self->{y}; 738 $y -= $self->{y};
700 739
701 my $res; 740 my $res;
702 741
703 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
705 and return $res; 744 and return $res;
706 } 745 }
707 746
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
750sub size_request { 789sub size_request {
751 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
752} 791}
753 792
754sub size_allocate { 793sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
756 795
757 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
758} 797}
759 798
760############################################################################# 799#############################################################################
800
801# back-buffered drawing area
761 802
762package CFClient::UI::Window; 803package CFClient::UI::Window;
763 804
764our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
765 806
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 819 $self->SUPER::update;
779} 820}
780 821
781sub size_allocate { 822sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
783 824
784 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
785 $self->update 826 $self->update;
786 if $changed;
787} 827}
788 828
789sub _render { 829sub _render {
830 my ($self) = @_;
831
790 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
791} 833}
792 834
793sub render_child { 835sub render_child {
794 my ($self) = @_; 836 my ($self) = @_;
795 837
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
799 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
800 $self->_render; 849 $self->_render;
801 }; 850 };
802} 851}
803 852
804sub _draw { 853sub _draw {
805 my ($self) = @_; 854 my ($self) = @_;
806 855
807 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
808 857
809 my $tex = $self->{texture} 858 my $tex = $self->{texture}
810 or return; 859 or return;
811 860
812 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
815 864
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 866
818 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
819} 868}
… …
835} 884}
836 885
837sub size_request { 886sub size_request {
838 my ($self) = @_; 887 my ($self) = @_;
839 888
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 890
842 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
844 893
845 ($w, $h) 894 ($w, $h)
846} 895}
847 896
848sub size_allocate { 897sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
850 899
900 my $child = $self->child;
901
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 904
854 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
855 $self->update; 906 $self->update;
856} 907}
857 908
… …
893} 944}
894 945
895sub _render { 946sub _render {
896 my ($self) = @_; 947 my ($self) = @_;
897 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 953
900 $self->SUPER::_render; 954 $self->SUPER::_render;
901} 955}
902 956
… …
905package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
906 960
907our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
908 962
909sub new { 963sub new {
910 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
911 967
912 my $self; 968 my $self;
913 969
914 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
915 vertical => 1, 971 vertical => 1,
… …
920 ; 976 ;
921 977
922 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 980 slider => $slider,
925 @_, 981 %arg,
926 ); 982 );
927 983
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
931 986
932 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
933} 994}
934 995
935sub update { 996sub update {
936 my ($self) = @_; 997 my ($self) = @_;
937 998
… …
941 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1004}
944 1005
945sub size_allocate { 1006sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
947 1008
948 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
949 1010
950 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1013}
953 1014
… …
976 1037
977 if ($self->{bg}) { 1038 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
979 1040
980 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
983 1044
984 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
985 glVertex 0 , 0; 1046 glVertex 0 , 0;
986 glVertex 0 , $h; 1047 glVertex 0 , $h;
987 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1009my @border = 1070my @border =
1010 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1011 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1012 1073
1013sub new { 1074sub new {
1014 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1015 1078
1016 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1017 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1018 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1019 border => 0.6, 1082 border => 0.6,
1020 is_toplevel => 1,
1021 can_events => 1, 1083 can_events => 1,
1022 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1023 ); 1087 );
1024 1088
1025 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1026 align => 0, 1090 align => 0,
1027 valign => 1, 1091 valign => 1,
1028 text => $self->{title}, 1092 text => $title,
1029 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1030 1095
1031 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1032} 1104}
1033 1105
1034sub border { 1106sub border {
1035 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1036} 1108}
1037 1109
1038sub size_request { 1110sub size_request {
1039 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1040 1115
1041 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1042 1117
1043 ( 1118 (
1044 $w + $self->border * 2, 1119 $w + $self->border * 2,
1045 $h + $self->border * 2, 1120 $h + $self->border * 2,
1046 ) 1121 )
1047} 1122}
1048 1123
1049sub size_allocate { 1124sub size_allocate {
1050 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1051 1126
1052 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1053 1132
1133 my $border = $self->border;
1134
1054 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1056 1137
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1061} 1139}
1062 1140
1063sub button_down { 1141sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1065 1143
… …
1081 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1082 1160
1083 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1085 1163
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1091 $self->realloc; 1168 $self->realloc;
1092 }; 1169 };
1093 1170
1094 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1098 $self->{motion} = sub { 1175 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1100 1177
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1179
1103 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1105 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->realloc;
1108 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1109 } 1188 1
1110} 1189}
1111 1190
1112sub button_up { 1191sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1114 1193
1115 delete $self->{motion}; 1194 !!delete $self->{motion}
1116} 1195}
1117 1196
1118sub mouse_motion { 1197sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1120 1199
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1122} 1203}
1123 1204
1124sub _draw { 1205sub _draw {
1125 my ($self) = @_; 1206 my ($self) = @_;
1126 1207
1208 my $child = $self->{children}[0];
1209
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1212
1130 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1215
1133 my $border = $self->border; 1216 my $border = $self->border;
… …
1148 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1149 } 1232 }
1150 1233
1151 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1152 1235
1153 $self->{title}->draw if $self->{title};
1154
1155 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1156} 1242}
1157 1243
1158############################################################################# 1244#############################################################################
1159 1245
1160package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1234 (sum @$hs), 1320 (sum @$hs),
1235 ) 1321 )
1236} 1322}
1237 1323
1238sub size_allocate { 1324sub size_allocate {
1239 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1240 1326
1241 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1242 1328
1243 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1244 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1322 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1323 ) 1409 )
1324} 1410}
1325 1411
1326sub size_allocate { 1412sub size_allocate {
1327 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1328 1414
1329 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1330 my $children = $self->{children}; 1416 my $children = $self->{children};
1331 1417
1332 my @req; 1418 my @req;
… …
1415 ellipsise => 3, # end 1501 ellipsise => 3, # end
1416 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1417 fontsize => 1, 1503 fontsize => 1,
1418 align => -1, 1504 align => -1,
1419 valign => -1, 1505 valign => -1,
1420 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1421 can_events => 0, 1508 can_events => 0,
1422 %arg 1509 %arg
1423 ); 1510 );
1424 1511
1425 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1452 1539
1453 delete $self->{texture}; 1540 delete $self->{texture};
1454 $self->SUPER::update; 1541 $self->SUPER::update;
1455} 1542}
1456 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1457sub set_text { 1551sub set_text {
1458 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1459 1553
1460 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1461 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1462 1556
1463 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1464 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1465 1559
1560 delete $self->{size_req};
1466 $self->realloc; 1561 $self->realloc;
1467 $self->update; 1562 $self->update;
1468} 1563}
1469 1564
1470sub set_markup { 1565sub set_markup {
… …
1476 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1477 1572
1478 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1479 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1480 1575
1576 delete $self->{size_req};
1481 $self->realloc; 1577 $self->realloc;
1482 $self->update; 1578 $self->update;
1483} 1579}
1484 1580
1485sub size_request { 1581sub size_request {
1486 my ($self) = @_; 1582 my ($self) = @_;
1487 1583
1584 $self->{size_req} ||= do {
1488 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1489 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1490 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1491 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1492 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1493 1590
1494 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1495 1592
1496 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1497 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1498 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1596
1500 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1501 1598
1502 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1503 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1504 } 1604 };
1505 1605
1506 ( 1606 @{ $self->{size_req} }
1507 $w + $self->{padding} * 2,
1508 $h + $self->{padding} * 2,
1509 )
1510} 1607}
1511 1608
1512sub size_allocate { 1609sub size_allocate {
1513 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1514 1613
1515 delete $self->{texture} 1614 delete $self->{texture}
1516 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1517} 1616}
1518 1617
1519sub set_fontsize { 1618sub set_fontsize {
1520 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1521 1620
1522 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1523 delete $self->{texture}; 1622 delete $self->{texture};
1524 1623
1525 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1526} 1633}
1527 1634
1528sub _draw { 1635sub _draw {
1529 my ($self) = @_; 1636 my ($self) = @_;
1530 1637
… …
1536 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1537 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1538 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1539 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1540 1647
1541 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1542 1650
1651 unless (exists $self->{ox}) {
1543 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1544 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1545 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1546 1655
1547 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1548 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1549 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1550
1551 $tex
1552 }; 1659 };
1553 1660
1554 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1555 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1556 1662
1557 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1558 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1559 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1560 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1561 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1562 } 1670 }
1563 1671
1564 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1565} 1673}
… …
1583 can_hover => 1, 1691 can_hover => 1,
1584 can_focus => 1, 1692 can_focus => 1,
1585 valign => 0, 1693 valign => 0,
1586 can_events => 1, 1694 can_events => 1,
1587 #text => ... 1695 #text => ...
1696 #hidden => "*",
1588 @_ 1697 @_
1589 ) 1698 )
1590} 1699}
1591 1700
1592sub _set_text { 1701sub _set_text {
… …
1594 1703
1595 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1596 1705
1597 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1598 1707
1599 delete $self->{texture};
1600
1601 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1602 $self->{text} = $text; 1709 $self->{text} = $text;
1603 1710
1604 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1605 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1606 1714
1607 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1608} 1719}
1609 1720
1610sub set_text { 1721sub set_text {
1611 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1612 1723
1613 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1614 $self->_set_text ($text); 1725 $self->_set_text ($text);
1615
1616 $self->realloc;
1617} 1726}
1618 1727
1619sub get_text { 1728sub get_text {
1620 $_[0]{text} 1729 $_[0]{text}
1621} 1730}
… …
1651 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1652 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1653 $self->_emit ('escape'); 1762 $self->_emit ('escape');
1654 } elsif ($uni) { 1763 } elsif ($uni) {
1655 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1656 } 1767 }
1657 1768
1658 $self->_set_text ($text); 1769 $self->_set_text ($text);
1659 1770
1660 $self->realloc; 1771 $self->realloc;
1772
1773 1
1661} 1774}
1662 1775
1663sub focus_in { 1776sub focus_in {
1664 my ($self) = @_; 1777 my ($self) = @_;
1665 1778
… …
1680 utf8::encode $text; 1793 utf8::encode $text;
1681 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1682 1795
1683 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1684 $self->update; 1797 $self->update;
1798
1799 1
1685} 1800}
1686 1801
1687sub mouse_motion { 1802sub mouse_motion {
1688 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1689# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1690} 1807}
1691 1808
1692sub _draw { 1809sub _draw {
1693 my ($self) = @_; 1810 my ($self) = @_;
1694 1811
1695 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1696 1813
1697 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1698 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1699 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1700 } else { 1817 } else {
1701 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1702 } 1819 }
1703 1820
1704 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1705 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1706 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1707 glVertex 0 , 0; 1824 glVertex 0 , 0;
1708 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1709 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1710 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1771 } else { 1888 } else {
1772 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1773 } 1890 }
1774 1891
1775 } else { 1892 } else {
1776 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1777 } 1896 1
1778
1779} 1897}
1780 1898
1781############################################################################# 1899#############################################################################
1782 1900
1783package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1792 1910
1793sub new { 1911sub new {
1794 my $class = shift; 1912 my $class = shift;
1795 1913
1796 $class->SUPER::new ( 1914 $class->SUPER::new (
1797 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1798 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1799 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1800 can_hover => 1, 1919 can_hover => 1,
1801 align => 0, 1920 align => 0,
1802 valign => 0, 1921 valign => 0,
… …
1811 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1812 1931
1813 $self->emit ("activate") 1932 $self->emit ("activate")
1814 if $x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1815 && $y >= 0 && $y < $self->{h}; 1934 && $y >= 0 && $y < $self->{h};
1935
1936 1
1816} 1937}
1817 1938
1818sub _draw { 1939sub _draw {
1819 my ($self) = @_; 1940 my ($self) = @_;
1820 1941
1821 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1822
1823 if ($GRAB == $self) {
1824 $self->{fg} = $self->{active_fg};
1825 }
1826 1943
1827 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1828 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1829 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1830 1947
… …
1849 1966
1850sub new { 1967sub new {
1851 my $class = shift; 1968 my $class = shift;
1852 1969
1853 $class->SUPER::new ( 1970 $class->SUPER::new (
1854 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1855 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1856 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1857 bg => [0, 0, 0, 0.2], 1975 bg => [0, 0, 0, 0.2],
1858 active_bg => [1, 1, 1, 0.5], 1976 active_bg => [1, 1, 1, 0.5],
1859 state => 0, 1977 state => 0,
… …
1863} 1981}
1864 1982
1865sub size_request { 1983sub size_request {
1866 my ($self) = @_; 1984 my ($self) = @_;
1867 1985
1868 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1869} 1987}
1870 1988
1871sub button_down { 1989sub button_down {
1872 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1873 1991
1874 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1875 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1876 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1877 $self->_emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1878 } 2000 1
1879} 2001}
1880 2002
1881sub _draw { 2003sub _draw {
1882 my ($self) = @_; 2004 my ($self) = @_;
1883 2005
1884 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1885 2007
1886 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1887 2009
1888 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1889 2013
1890 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1891 2015
1892 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1893 2017
… …
2048 2172
2049 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2050 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2051 2175
2052 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2053 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2054 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2056 2181
2057 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2058 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2158 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2159 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2160 bg => [0, 0, 0, 0.2], 2285 bg => [0, 0, 0, 0.2],
2161 active_bg => [1, 1, 1, 0.5], 2286 active_bg => [1, 1, 1, 0.5],
2162 range => [0, 0, 100, 10, 0], 2287 range => [0, 0, 100, 10, 0],
2163 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2164 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2165 vertical => 0, 2290 vertical => 0,
2166 can_hover => 1, 2291 can_hover => 1,
2167 inner_pad => 0.02, 2292 inner_pad => 0.02,
2168 @_ 2293 @_
2169 ); 2294 );
… …
2209} 2334}
2210 2335
2211sub size_request { 2336sub size_request {
2212 my ($self) = @_; 2337 my ($self) = @_;
2213 2338
2214 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2215 my $h = $self->{req_h};
2216
2217 $self->{vertical} ? ($h, $w) : ($w, $h)
2218} 2340}
2219 2341
2220sub button_down { 2342sub button_down {
2221 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2222 2344
2223 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2224 2346
2225 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2226 2348
2227 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2228} 2350}
2229 2351
2230sub mouse_motion { 2352sub mouse_motion {
2231 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2232 2354
… …
2236 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2237 2359
2238 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2239 2361
2240 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2241 } 2367 1
2242} 2368}
2243 2369
2244sub update { 2370sub update {
2245 my ($self) = @_; 2371 my ($self) = @_;
2246 2372
2247 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2248 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2249 2382
2250 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2251 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2252 2385
… …
2258 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2259 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2260 2393
2261 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2262 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2263 }); 2396 }
2264
2265 $self->SUPER::update;
2266}
2267
2268sub _draw {
2269 my ($self) = @_;
2270 2397
2271 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2272 2399
2273 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2274 2401
… …
2372 $self->{fontsize} = $fontsize; 2499 $self->{fontsize} = $fontsize;
2373 $self->reflow; 2500 $self->reflow;
2374} 2501}
2375 2502
2376sub size_allocate { 2503sub size_allocate {
2377 my ($self, $w, $h, $changed) = @_; 2504 my ($self, $w, $h) = @_;
2378 2505
2379 $self->SUPER::size_allocate ($w, $h, $changed); 2506 $self->SUPER::size_allocate ($w, $h);
2380
2381 return unless $changed;
2382 2507
2383 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2508 $self->{layout}->set_font ($self->{font}) if $self->{font};
2384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2385 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2386 2511
… …
2470 2595
2471 delete $self->{texture}; 2596 delete $self->{texture};
2472 } 2597 }
2473 2598
2474 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2599 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2475 glClearColor 0.5, 0.5, 0.5, 0; 2600 glClearColor 0, 0, 0, 0;
2476 glClear GL_COLOR_BUFFER_BIT; 2601 glClear GL_COLOR_BUFFER_BIT;
2477 2602
2478 my $top = int $self->{children}[1]{range}[0]; 2603 my $top = int $self->{children}[1]{range}[0];
2479 2604
2480 my $y0 = $top; 2605 my $y0 = $top;
… …
2515sub _draw { 2640sub _draw {
2516 my ($self) = @_; 2641 my ($self) = @_;
2517 2642
2518 glEnable GL_TEXTURE_2D; 2643 glEnable GL_TEXTURE_2D;
2519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2644 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2520 glColor 1, 1, 1, 1; 2645 glColor 0, 0, 0, 1;
2521 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2646 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2522 glDisable GL_TEXTURE_2D; 2647 glDisable GL_TEXTURE_2D;
2523 2648
2524 $self->{children}[1]->draw; 2649 $self->{children}[1]->draw;
2525 2650
2526} 2651}
… …
2609} 2734}
2610 2735
2611sub set_tooltip_from { 2736sub set_tooltip_from {
2612 my ($self, $widget) = @_; 2737 my ($self, $widget) = @_;
2613 2738
2739 my $tooltip = $widget->{tooltip};
2740
2741 if ($ENV{CFPLUS_DEBUG} & 2) {
2742 $tooltip .= "\n\n" . (ref $widget) . "\n"
2743 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2744 . "req $widget->{req_w} $widget->{req_h}\n"
2745 . "visible $widget->{visible}";
2746 }
2747
2614 $self->add (new CFClient::UI::Label 2748 $self->add (new CFClient::UI::Label
2615 markup => $widget->{tooltip}, 2749 markup => $tooltip,
2616 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2750 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2617 fontsize => 0.8, 2751 fontsize => 0.8,
2618 fg => [0, 0, 0, 1], 2752 fg => [0, 0, 0, 1],
2619 ellipsise => 0, 2753 ellipsise => 0,
2620 font => ($widget->{tooltip_font} || $::FONT_PROP), 2754 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2628 2762
2629 ($w + 4, $h + 4) 2763 ($w + 4, $h + 4)
2630} 2764}
2631 2765
2632sub size_allocate { 2766sub size_allocate {
2633 my ($self, $w, $h, $changed) = @_; 2767 my ($self, $w, $h) = @_;
2634 2768
2635 return unless $changed;
2636
2637 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2769 $self->SUPER::size_allocate ($w - 4, $h - 4);
2638} 2770}
2639 2771
2640sub visibility_change { 2772sub visibility_change {
2641 my ($self, $visible) = @_; 2773 my ($self, $visible) = @_;
2642 2774
… …
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2781 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2782
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2783 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2784 if $x + $self->{w} > $::WIDTH;
2653 2785
2654 $self->move ($x, $y); 2786 $self->move_abs ($x, $y);
2655 }); 2787 });
2656} 2788}
2657 2789
2658sub _draw { 2790sub _draw {
2659 my ($self) = @_; 2791 my ($self) = @_;
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2878 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 2879
2748 if ($tex) { 2880 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 2881 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2882 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 2883 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2884 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 2885 glDisable GL_TEXTURE_2D;
2754 } 2886 }
2755} 2887}
2756 2888
… …
2763 $self->SUPER::DESTROY; 2895 $self->SUPER::DESTROY;
2764} 2896}
2765 2897
2766############################################################################# 2898#############################################################################
2767 2899
2768package CFClient::UI::Inventory; 2900package CFClient::UI::Buttonbar;
2769 2901
2770our @ISA = CFClient::UI::ScrolledWindow::; 2902our @ISA = CFClient::UI::HBox::;
2771 2903
2772sub new { 2904# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 2905
2808############################################################################# 2906#############################################################################
2809 2907
2810package CFClient::UI::Menu; 2908package CFClient::UI::Menu;
2811 2909
… …
2823 ); 2921 );
2824 2922
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2923 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 2924
2827 for my $item (@{ $self->{items} }) { 2925 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 2926 my ($widget, $cb, $tooltip) = @$item;
2829 2927
2830 # handle various types of items, only text for now 2928 # handle various types of items, only text for now
2831 if (!ref $widget) { 2929 if (!ref $widget) {
2832 $widget = new CFClient::UI::Label 2930 $widget = new CFClient::UI::Label
2833 can_hover => 1, 2931 can_hover => 1,
2834 can_events => 1, 2932 can_events => 1,
2835 text => $widget; 2933 text => $widget,
2934 tooltip => $tooltip
2836 } 2935 }
2837 2936
2838 $self->{item}{$widget} = $item; 2937 $self->{item}{$widget} = $item;
2839 2938
2840 $self->{vbox}->add ($widget); 2939 $self->{vbox}->add ($widget);
… …
2852 # maybe save $GRAB? must be careful about events... 2951 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2952 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2953 $self->{button} = $ev->{button};
2855 2954
2856 $self->show; 2955 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2956 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2957}
2859 2958
2860sub mouse_motion { 2959sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2862 2961
2863 # TODO: should use vbox->find_widget or so 2962 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2963 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 2964 $self->{hover} = $self->{item}{$HOVER};
2965
2966 0
2866} 2967}
2867 2968
2868sub button_up { 2969sub button_up {
2869 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2870 2971
… …
2872 undef $GRAB; 2973 undef $GRAB;
2873 $self->hide; 2974 $self->hide;
2874 2975
2875 $self->_emit ("popdown"); 2976 $self->_emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 2977 $self->{hover}[1]->() if $self->{hover};
2978 } else {
2979 return 0
2980 }
2981
2877 } 2982 1
2878} 2983}
2879 2984
2880############################################################################# 2985#############################################################################
2881 2986
2882package CFClient::UI::Statusbox; 2987package CFClient::UI::Multiplexer;
2883 2988
2884our @ISA = CFClient::UI::VBox::; 2989our @ISA = CFClient::UI::Container::;
2885 2990
2886sub new { 2991sub new {
2887 my $class = shift; 2992 my $class = shift;
2888 2993
2889 $class->SUPER::new ( 2994 my $self = $class->SUPER::new (
2995 @_,
2996 );
2997
2998 $self->{current} = $self->{children}[0]
2999 if @{ $self->{children} };
3000
3001 $self
3002}
3003
3004sub add {
3005 my ($self, @widgets) = @_;
3006
3007 $self->SUPER::add (@widgets);
3008
3009 $self->{current} = $self->{children}[0]
3010 if @{ $self->{children} };
3011}
3012
3013sub set_current_page {
3014 my ($self, $page_or_widget) = @_;
3015
3016 my $widget = ref $page_or_widget
3017 ? $page_or_widget
3018 : $self->{children}[$page_or_widget];
3019
3020 $self->{current} = $widget;
3021 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3022
3023 $self->_emit (page_changed => $self->{current});
3024
3025 $self->realloc;
3026}
3027
3028sub visible_children {
3029 $_[0]{current}
3030}
3031
3032sub size_request {
3033 my ($self) = @_;
3034
3035 $self->{current}->size_request
3036}
3037
3038sub size_allocate {
3039 my ($self, $w, $h) = @_;
3040
3041 $self->{current}->configure (0, 0, $w, $h);
3042}
3043
3044sub _draw {
3045 my ($self) = @_;
3046
3047 $self->{current}->draw;
3048}
3049
3050#############################################################################
3051
3052package CFClient::UI::Notebook;
3053
3054our @ISA = CFClient::UI::VBox::;
3055
3056sub new {
3057 my $class = shift;
3058
3059 my $self = $class->SUPER::new (
3060 buttonbar => (new CFClient::UI::Buttonbar),
3061 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3062 # filter => # will be put between multiplexer and $self
3063 @_,
3064 );
3065
3066 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3067 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3068
3069 $self
3070}
3071
3072sub add {
3073 my ($self, $title, $widget, $tooltip) = @_;
3074
3075 Scalar::Util::weaken $self;
3076
3077 $self->{buttonbar}->add (new CFClient::UI::Button
3078 markup => $title,
3079 tooltip => $tooltip,
3080 on_activate => sub { $self->set_current_page ($widget) },
3081 );
3082
3083 $self->{multiplexer}->add ($widget);
3084}
3085
3086sub set_current_page {
3087 my ($self, $page) = @_;
3088
3089 $self->{multiplexer}->set_current_page ($page);
3090 $self->_emit (page_changed => $self->{multiplexer}{current});
3091}
3092
3093#############################################################################
3094
3095package CFClient::UI::Combobox;
3096
3097use utf8;
3098
3099our @ISA = CFClient::UI::Button::;
3100
3101sub new {
3102 my $class = shift;
3103
3104 my $self = $class->SUPER::new (
3105 options => [], # [title, value, tooltip], ...
3106 value => undef,
3107 @_,
3108 );
3109
3110 $self->_set_value ($self->{value});
3111
3112 $self
3113}
3114
3115sub button_down {
3116 my ($self, $ev) = @_;
3117
3118 my @menu_items;
3119
3120 for (@{ $self->{options} }) {
3121 my ($title, $value, $tooltip) = @$_;
3122
3123 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3124 }
3125
3126 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3127}
3128
3129sub _set_value {
3130 my ($self, $value) = @_;
3131
3132 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3133 or return;
3134
3135 $self->{value} = $item->[1];
3136 $self->set_markup ("$item->[0] ⇓");
3137 $self->set_tooltip ($item->[2]);
3138}
3139
3140sub set_value {
3141 my ($self, $value) = @_;
3142
3143 return unless $self->{value} ne $value;
3144
3145 $self->_set_value ($value);
3146 $self->_emit (changed => $value);
3147}
3148
3149#############################################################################
3150
3151package CFClient::UI::Statusbox;
3152
3153our @ISA = CFClient::UI::VBox::;
3154
3155sub new {
3156 my $class = shift;
3157
3158 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3159 fontsize => 0.8,
2891 @_, 3160 @_,
2892 ) 3161 );
3162
3163 Scalar::Util::weaken (my $this = $self);
3164
3165 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3166
3167 $self
2893} 3168}
2894 3169
2895sub reorder { 3170sub reorder {
2896 my ($self) = @_; 3171 my ($self) = @_;
2897 my $NOW = time; 3172 my $NOW = Time::HiRes::time;
3173
3174 # freeze display when hovering over any label
3175 return if $CFClient::UI::TOOLTIP->{owner}
3176 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3177 values %{ $self->{item} };
2898 3178
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3179 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3180 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3181 }
2902 3182
… …
2905 my @items = sort { 3185 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3186 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3187 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3188 } values %{ $self->{item} };
2909 3189
3190 $self->{timer}->interval (1);
3191
2910 my $count = 10 + 1; 3192 my $count = 10 + 1;
2911 for my $item (@items) { 3193 for my $item (@items) {
2912 last unless --$count; 3194 last unless --$count;
2913 3195
2914 push @widgets, $item->{label} ||= do { 3196 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3197 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3198 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3199 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3200 : $item->{text};
2919 3201
… …
2927 tooltip => $item->{tooltip}, 3209 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3210 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3211 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3212 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3213 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3214 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3215 can_events => 1,
2934 can_hover => 1 3216 can_hover => 1
2935 }; 3217 };
3218
3219 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3220 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3221 $label->update;
3222 $label->set_max_size (undef, $label->{req_h} * $diff)
3223 if $diff < 1;
3224 $self->{timer}->interval (1/30);
3225 } else {
3226 $label->{fg}[3] = $item->{fg}[3] || 1;
3227 }
3228
3229 push @widgets, $label;
2936 } 3230 }
2937 3231
2938 $self->clear; 3232 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3233 $self->SUPER::add (reverse @widgets);
2940} 3234}
… …
2945 $text =~ s/^\s+//; 3239 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3240 $text =~ s/\s+$//;
2947 3241
2948 return unless $text; 3242 return unless $text;
2949 3243
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3244 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3245
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3246 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3247
2954 if (my $item = $self->{item}{$group}) { 3248 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3249 if ($item->{text} eq $text) {
… …
2985 3279
2986 $self->reorder; 3280 $self->reorder;
2987 $self->SUPER::reconfigure; 3281 $self->SUPER::reconfigure;
2988} 3282}
2989 3283
3284sub DESTROY {
3285 my ($self) = @_;
3286
3287 $self->{timer}->cancel;
3288
3289 $self->SUPER::DESTROY;
3290}
3291
2990############################################################################# 3292#############################################################################
2991 3293
3294package CFClient::UI::Inventory;
3295
3296our @ISA = CFClient::UI::ScrolledWindow::;
3297
3298sub new {
3299 my $class = shift;
3300
3301 my $self = $class->SUPER::new (
3302 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3303 @_,
3304 );
3305
3306 $self
3307}
3308
3309sub set_items {
3310 my ($self, $items) = @_;
3311
3312 $self->{child}->clear;
3313 return unless $items;
3314
3315 my @items = sort {
3316 ($a->{type} <=> $b->{type})
3317 or ($a->{name} cmp $b->{name})
3318 } @$items;
3319
3320 $self->{real_items} = \@items;
3321
3322 my $row = 0;
3323 for my $item (@items) {
3324 CFClient::Item::update_widgets $item;
3325
3326 $self->{child}->add (0, $row, $item->{face_widget});
3327 $self->{child}->add (1, $row, $item->{desc_widget});
3328 $self->{child}->add (2, $row, $item->{weight_widget});
3329
3330 $row++;
3331 }
3332}
3333
3334#############################################################################
3335
3336package CFClient::UI::BindEditor;
3337
3338our @ISA = CFClient::UI::FancyFrame::;
3339
3340sub new {
3341 my $class = shift;
3342
3343 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3344
3345 $self->add (my $vb = new CFClient::UI::VBox);
3346
3347
3348 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3349 text => "start recording",
3350 tooltip => "Start/Stops recording of actions."
3351 ."All subsequent actions after the recording started will be captured."
3352 ."The actions are displayed after the record was stopped."
3353 ."To bind the action you have to click on the 'Bind' button",
3354 on_activate => sub {
3355 unless ($self->{recording}) {
3356 $self->start;
3357 } else {
3358 $self->stop;
3359 }
3360 });
3361
3362 $vb->add (new CFClient::UI::Label text => "Actions:");
3363 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3364
3365 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3366 $vb->add (my $hb = new CFClient::UI::HBox);
3367 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3368 $hb->add (new CFClient::UI::Button
3369 text => "bind",
3370 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3371 on_activate => sub {
3372 $self->ask_for_bind;
3373 });
3374
3375 $vb->add (my $hb = new CFClient::UI::HBox);
3376 $hb->add (new CFClient::UI::Button
3377 text => "ok",
3378 expand => 1,
3379 tooltip => "This closes the binding editor and saves the binding",
3380 on_activate => sub {
3381 $self->hide;
3382 $self->commit;
3383 });
3384
3385 $hb->add (new CFClient::UI::Button
3386 text => "cancel",
3387 expand => 1,
3388 tooltip => "This closes the binding editor without saving",
3389 on_activate => sub {
3390 $self->hide;
3391 $self->{binding_cancel}->()
3392 if $self->{binding_cancel};
3393 });
3394
3395 $self->update_binding_widgets;
3396
3397 $self
3398}
3399
3400sub commit {
3401 my ($self) = @_;
3402 my ($mod, $sym, $cmds) = $self->get_binding;
3403 if ($sym != 0 && @$cmds > 0) {
3404 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3405 ."'. Don't forget 'Save Config'!");
3406 $self->{binding_change}->($mod, $sym, $cmds)
3407 if $self->{binding_change};
3408 } else {
3409 $::STATUSBOX->add ("No action bound, no key or action specified!");
3410 $self->{binding_cancel}->()
3411 if $self->{binding_cancel};
3412 }
3413}
3414
3415sub start {
3416 my ($self) = @_;
3417
3418 $self->{rec_btn}->set_text ("stop recording");
3419 $self->{recording} = 1;
3420 $self->clear_command_list;
3421 $::CONN->start_record if $::CONN;
3422}
3423
3424sub stop {
3425 my ($self) = @_;
3426
3427 $self->{rec_btn}->set_text ("start recording");
3428 $self->{recording} = 0;
3429
3430 my $rec;
3431 $rec = $::CONN->stop_record if $::CONN;
3432 return unless ref $rec eq 'ARRAY';
3433 $self->set_command_list ($rec);
3434}
3435
3436
3437sub ask_for_bind_and_commit {
3438 my ($self) = @_;
3439 $self->ask_for_bind (1);
3440}
3441
3442sub ask_for_bind {
3443 my ($self, $commit) = @_;
3444
3445 CFClient::Binder::open_binding_dialog (sub {
3446 my ($mod, $sym) = @_;
3447 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3448 $self->update_binding_widgets;
3449 $self->commit if $commit;
3450 });
3451}
3452
3453# $mod and $sym are the modifiers and key symbol
3454# $cmds is a array ref of strings (the commands)
3455# $cb is the callback that is executed on OK
3456# $ccb is the callback that is executed on CANCEL and
3457# when the binding was unsuccessful on OK
3458sub set_binding {
3459 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3460
3461 $self->clear_command_list;
3462 $self->{recording} = 0;
3463 $self->{rec_btn}->set_text ("start recording");
3464
3465 $self->{binding} = [$mod, $sym];
3466 $self->{commands} = $cmds;
3467
3468 $self->{binding_change} = $cb;
3469 $self->{binding_cancel} = $ccb;
3470
3471 $self->update_binding_widgets;
3472}
3473
3474# this is a shortcut method that asks for a binding
3475# and then just binds it.
3476sub do_quick_binding {
3477 my ($self, $cmds) = @_;
3478 $self->set_binding (undef, undef, $cmds, sub {
3479 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3480 });
3481 $self->ask_for_bind (1);
3482}
3483
3484sub update_binding_widgets {
3485 my ($self) = @_;
3486 my ($mod, $sym, $cmds) = $self->get_binding;
3487 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3488 $self->set_command_list ($cmds);
3489}
3490
3491sub get_binding {
3492 my ($self) = @_;
3493 return (
3494 $self->{binding}->[0],
3495 $self->{binding}->[1],
3496 [ grep { defined $_ } @{$self->{commands}} ]
3497 );
3498}
3499
3500sub clear_command_list {
3501 my ($self) = @_;
3502 $self->{cmdbox}->clear ();
3503}
3504
3505sub set_command_list {
3506 my ($self, $cmds) = @_;
3507
3508 $self->{cmdbox}->clear ();
3509 $self->{commands} = $cmds;
3510
3511 my $idx = 0;
3512
3513 for (@$cmds) {
3514 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3515
3516 my $i = $idx;
3517 $hb->add (new CFClient::UI::Label text => $_);
3518 $hb->add (new CFClient::UI::Button
3519 text => "delete",
3520 tooltip => "Deletes the action from the record",
3521 on_activate => sub {
3522 $self->{cmdbox}->remove ($hb);
3523 $cmds->[$i] = undef;
3524 });
3525
3526
3527 $idx++
3528 }
3529}
3530
3531#############################################################################
3532
3533package CFClient::UI::SpellList;
3534
3535our @ISA = CFClient::UI::Table::;
3536
3537sub new {
3538 my $class = shift;
3539
3540 my $self = $class->SUPER::new (
3541 binding => [],
3542 commands => [],
3543 @_,
3544 )
3545}
3546
3547my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3548 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3549my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3550 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3551my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3553
3554sub rebuild_spell_list {
3555 my ($self) = @_;
3556
3557 $CFClient::UI::ROOT->on_refresh ($self => sub {
3558 $self->clear;
3559
3560 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3561 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3562 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3563 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3564
3565 my $row = 0;
3566
3567 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3568 my $spell = $self->{spell}{$_};
3569
3570 $row++;
3571
3572 $self->add (0, $row, new CFClient::UI::Face
3573 face => $spell->{face},
3574 can_hover => 1,
3575 can_events => 1,
3576 tooltip => $spell->{message},
3577 );
3578
3579 $self->add (1, $row, new CFClient::UI::Label
3580 expand => 1,
3581 text => $spell->{name},
3582 can_hover => 1,
3583 can_events => 1,
3584 tooltip => $spell->{message},
3585 );
3586
3587 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3588 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3589 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3590
3591 # TODO: should be done via popup
3592 $self->add (5, $row, new CFClient::UI::Button
3593 text => "bind",
3594 tooltip => "bind spell readying (cast command) to key",
3595 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3596 );
3597 }
3598 });
3599}
3600
3601sub add_spell {
3602 my ($self, $spell) = @_;
3603
3604 $self->{spell}->{$spell->{name}} = $spell;
3605 $self->rebuild_spell_list;
3606}
3607
3608sub remove_spell {
3609 my ($self, $spell) = @_;
3610
3611 delete $self->{spell}->{$spell->{name}};
3612 $self->rebuild_spell_list;
3613}
3614
3615#############################################################################
3616
2992package CFClient::UI::Root; 3617package CFClient::UI::Root;
2993 3618
2994our @ISA = CFClient::UI::Container::; 3619our @ISA = CFClient::UI::Container::;
3620
3621use List::Util qw(min max);
2995 3622
2996use CFClient::OpenGL; 3623use CFClient::OpenGL;
2997 3624
2998sub new { 3625sub new {
2999 my $class = shift; 3626 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3633 Scalar::Util::weaken ($self->{root} = $self);
3007 3634
3008 $self 3635 $self
3009} 3636}
3010 3637
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3638sub size_request {
3028 my ($self) = @_; 3639 my ($self) = @_;
3029 3640
3030 ($self->{w}, $self->{h}) 3641 ($self->{w}, $self->{h})
3031} 3642}
3032 3643
3644sub _to_pixel {
3645 my ($coord, $size, $max) = @_;
3646
3647 $coord =
3648 $coord eq "center" ? ($max - $size) * 0.5
3649 : $coord eq "max" ? $max
3650 : $coord;
3651
3652 $coord = 0 if $coord < 0;
3653 $coord = $max - $size if $coord > $max - $size;
3654
3655 int $coord + 0.5
3656}
3657
3033sub size_allocate { 3658sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3659 my ($self, $w, $h) = @_;
3035 3660
3036 for my $child ($self->children) { 3661 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3662 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3663
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3664 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3665 $Y = $child->{force_y} if exists $child->{force_y};
3041 3666
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3667 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3668 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3669
3050 $child->configure ($X, $Y, $W, $H); 3670 $child->configure ($X, $Y, $W, $H);
3051 } 3671 }
3052} 3672}
3053 3673
… …
3070} 3690}
3071 3691
3072sub add { 3692sub add {
3073 my ($self, @children) = @_; 3693 my ($self, @children) = @_;
3074 3694
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3695 $_->{is_toplevel} = 1
3077 3696 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3697
3083 $self->SUPER::add (@children); 3698 $self->SUPER::add (@children);
3084} 3699}
3085 3700
3086sub remove { 3701sub remove {
3087 my ($self, @children) = @_; 3702 my ($self, @children) = @_;
3088 3703
3089 $self->SUPER::remove (@children); 3704 $self->SUPER::remove (@children);
3705
3706 delete $self->{is_toplevel}
3707 for @children;
3090 3708
3091 while (@children) { 3709 while (@children) {
3092 my $w = pop @children; 3710 my $w = pop @children;
3093 push @children, $w->children; 3711 push @children, $w->children;
3094 $w->set_invisible; 3712 $w->set_invisible;
… …
3114 $_->() 3732 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3733 for values %{delete $self->{refresh_hook}};
3116 } 3734 }
3117 3735
3118 if ($self->{realloc}) { 3736 if ($self->{realloc}) {
3737 my %queue;
3119 my @queue; 3738 my @queue;
3739 my $widget;
3120 3740
3741 outer:
3121 while () { 3742 while () {
3122 if ($self->{realloc}) { 3743 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3744 for $widget (values %$realloc) {
3745 $widget->{visible} or next; # do not resize invisible widgets
3124 3746
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3747 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3748
3749 push @{ $queue[$widget->{visible}] }, $widget;
3750 }
3127 } 3751 }
3128 3752
3753 while () {
3754 @queue or last outer;
3755
3756 $widget = pop @{ $queue[-1] || [] }
3757 and last;
3758
3759 pop @queue;
3760 }
3761
3762 delete $queue{$widget+0};
3763
3764 my ($w, $h) = $widget->size_request;
3765
3766 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3767 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3768
3769 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3770 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3771
3772 $w = $widget->{force_w} if exists $widget->{force_w};
3773 $h = $widget->{force_h} if exists $widget->{force_h};
3774
3775 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3776 || delete $widget->{force_realloc}) {
3777 $widget->{req_w} = $w;
3778 $widget->{req_h} = $h;
3779
3780 $self->{size_alloc}{$widget+0} = $widget;
3781
3782 if (my $parent = $widget->{parent}) {
3783 $self->{realloc}{$parent+0} = $parent
3784 unless $queue{$parent+0};
3785
3786 $parent->{force_size_alloc} = 1;
3787 $self->{size_alloc}{$parent+0} = $parent;
3788 }
3789 }
3790
3791 delete $self->{realloc}{$widget+0};
3792 }
3793 }
3794
3795 while (my $size_alloc = delete $self->{size_alloc}) {
3796 my @queue = sort { $b->{visible} <=> $a->{visible} }
3797 values %$size_alloc;
3798
3799 while () {
3129 my $widget = pop @queue || last; 3800 my $widget = pop @queue || last;
3130 3801
3131 $widget->{visible} or last; # do not resize invisible widgets 3802 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3803
3156 $w = 0 if $w < 0; 3804 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3805 $h = 0 if $h < 0;
3158 3806
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3807 $w = int $w + 0.5;
3808 $h = int $h + 0.5;
3160 3809
3810 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3811 $widget->{old_w} = $widget->{w};
3812 $widget->{old_h} = $widget->{h};
3813
3161 $widget->{w} = $w; 3814 $widget->{w} = $w;
3162 $widget->{h} = $h; 3815 $widget->{h} = $h;
3163 3816
3164 $widget->emit (size_allocate => $w, $h, $changed); 3817 $widget->emit (size_allocate => $w, $h);
3818 }
3165 } 3819 }
3166 } 3820 }
3167 3821
3168 while ($self->{post_alloc_hook}) { 3822 while ($self->{post_alloc_hook}) {
3169 $_->() 3823 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3824 for values %{delete $self->{post_alloc_hook}};
3171 } 3825 }
3826
3172 3827
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3828 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3829 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3830 glClear GL_COLOR_BUFFER_BIT;
3176 3831
… …
3178 glLoadIdentity; 3833 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3834 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3835 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3836 glLoadIdentity;
3182 3837
3838 {
3839 package CFClient::UI::Base;
3840
3841 ($draw_x, $draw_y, $draw_w, $draw_h) =
3842 (0, 0, $self->{w}, $self->{h});
3843 }
3844
3183 $self->_draw; 3845 $self->_draw;
3184} 3846}
3185 3847
3186############################################################################# 3848#############################################################################
3187 3849

Diff Legend

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