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.254 by root, Mon May 29 01:53:23 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
542
513sub draw { 543sub draw {
514 my ($self) = @_; 544 my ($self) = @_;
515 545
516 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 557
518 glPushMatrix; 558 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 560
523 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 563 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 565 glBegin GL_QUADS;
530 glVertex $x , $y; 566 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
534 glEnd; 570 glEnd;
535 glDisable GL_BLEND; 571 glDisable GL_BLEND;
536 } 572 }
537 573
538 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 575 glPushMatrix;
540 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 579 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
547 glEnd; 583 glEnd;
548 glPopMatrix; 584 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
551} 590}
552 591
553sub _draw { 592sub _draw {
554 my ($self) = @_; 593 my ($self) = @_;
555 594
… …
593 632
594 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
596 635
597 glEnable GL_BLEND; 636 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 638 glColor_premultiply @$color;
600 639
601 glBegin GL_QUADS; 640 glBegin GL_QUADS;
602 glVertex 0 , 0; 641 glVertex 0 , 0;
603 glVertex 0 , $h; 642 glVertex 0 , $h;
604 glVertex $w, $h; 643 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
621} 660}
622 661
623sub size_request { 662sub size_request {
624 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
625} 666}
626 667
627sub draw { } 668sub draw { }
628 669
629############################################################################# 670#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
634 675
635sub new { 676sub new {
636 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
637 678
638 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
639 680
640 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
641 children => [], 682 children => [],
642 can_events => 0, 683 can_events => 0,
643 %arg, 684 %arg,
644 ); 685 );
686
645 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
646 689
647 $self 690 $self
648} 691}
649 692
650sub add { 693sub add {
… …
698 $x -= $self->{x}; 741 $x -= $self->{x};
699 $y -= $self->{y}; 742 $y -= $self->{y};
700 743
701 my $res; 744 my $res;
702 745
703 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
705 and return $res; 748 and return $res;
706 } 749 }
707 750
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
750sub size_request { 793sub size_request {
751 $_[0]{children}[0]->size_request 794 $_[0]{children}[0]->size_request
752} 795}
753 796
754sub size_allocate { 797sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 798 my ($self, $w, $h) = @_;
756 799
757 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
758} 801}
759 802
760############################################################################# 803#############################################################################
804
805# back-buffered drawing area
761 806
762package CFClient::UI::Window; 807package CFClient::UI::Window;
763 808
764our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
765 810
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 822 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 823 $self->SUPER::update;
779} 824}
780 825
781sub size_allocate { 826sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 827 my ($self, $w, $h) = @_;
783 828
784 $self->SUPER::size_allocate ($w, $h, $changed); 829 $self->SUPER::size_allocate ($w, $h);
785 $self->update 830 $self->update;
786 if $changed;
787} 831}
788 832
789sub _render { 833sub _render {
834 my ($self) = @_;
835
790 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
791} 837}
792 838
793sub render_child { 839sub render_child {
794 my ($self) = @_; 840 my ($self) = @_;
795 841
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
799 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
800 $self->_render; 853 $self->_render;
801 }; 854 };
802} 855}
803 856
804sub _draw { 857sub _draw {
805 my ($self) = @_; 858 my ($self) = @_;
806 859
807 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
808 861
809 my $tex = $self->{texture} 862 my $tex = $self->{texture}
810 or return; 863 or return;
811 864
812 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
815 868
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 870
818 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
819} 872}
… …
835} 888}
836 889
837sub size_request { 890sub size_request {
838 my ($self) = @_; 891 my ($self) = @_;
839 892
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 894
842 $w = 10 if $self->{scroll_x}; 895 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 896 $h = 10 if $self->{scroll_y};
844 897
845 ($w, $h) 898 ($w, $h)
846} 899}
847 900
848sub size_allocate { 901sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 902 my ($self, $w, $h) = @_;
850 903
904 my $child = $self->child;
905
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 908
854 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
855 $self->update; 910 $self->update;
856} 911}
857 912
… …
893} 948}
894 949
895sub _render { 950sub _render {
896 my ($self) = @_; 951 my ($self) = @_;
897 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 957
900 $self->SUPER::_render; 958 $self->SUPER::_render;
901} 959}
902 960
… …
905package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
906 964
907our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
908 966
909sub new { 967sub new {
910 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
911 971
912 my $self; 972 my $self;
913 973
914 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
915 vertical => 1, 975 vertical => 1,
… …
920 ; 980 ;
921 981
922 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 984 slider => $slider,
925 @_, 985 %arg,
926 ); 986 );
927 987
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
931 990
932 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
933} 998}
934 999
935sub update { 1000sub update {
936 my ($self) = @_; 1001 my ($self) = @_;
937 1002
… …
941 my $child = $self->{vp}->child; 1006 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1007 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1008}
944 1009
945sub size_allocate { 1010sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1011 my ($self, $w, $h) = @_;
947 1012
948 $self->SUPER::size_allocate ($w, $h, $changed); 1013 $self->SUPER::size_allocate ($w, $h);
949 1014
950 my $child = $self->{vp}->child; 1015 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1016 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1017}
953 1018
… …
976 1041
977 if ($self->{bg}) { 1042 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
979 1044
980 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
983 1048
984 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
985 glVertex 0 , 0; 1050 glVertex 0 , 0;
986 glVertex 0 , $h; 1051 glVertex 0 , $h;
987 glVertex $w, $h; 1052 glVertex $w, $h;
… …
1000 1065
1001our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
1002 1067
1003use CFClient::OpenGL; 1068use CFClient::OpenGL;
1004 1069
1005my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1077
1009sub new { 1078sub new {
1010 my $class = shift; 1079 my ($class, %arg) = @_;
1080
1081 my $title = delete $arg{title};
1011 1082
1012 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1086 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1087 can_events => 1,
1018 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
1019 ); 1091 );
1020 1092
1021 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
1022 align => 0, 1094 align => 0,
1023 valign => 1, 1095 valign => 1,
1024 text => $self->{title}, 1096 text => $title,
1025 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
1026 1099
1027 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028} 1108}
1029 1109
1030sub border { 1110sub border {
1031 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
1032} 1112}
1033 1113
1034sub size_request { 1114sub size_request {
1035 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
1036 1119
1037 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
1038 1121
1039 ( 1122 (
1040 $w + $self->border * 2, 1123 $w + $self->border * 2,
1041 $h + $self->border * 2, 1124 $h + $self->border * 2,
1042 ) 1125 )
1043} 1126}
1044 1127
1045sub size_allocate { 1128sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1129 my ($self, $w, $h) = @_;
1047 1130
1048 return unless $changed; 1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1049 1136
1137 my $border = $self->border;
1138
1050 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
1052 1141
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
1057} 1143}
1058 1144
1059sub button_down { 1145sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1061 1147
… …
1077 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1078 1164
1079 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1081 1167
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1170
1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1172 $self->realloc;
1088 }; 1173 };
1089 1174
1090 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1179 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1096 1181
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1183
1099 $self->{user_x} = $bx + $x - $ox; 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1185 # HACK: the next line is required to enforce placement
1101 1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1105 } 1192 1
1106} 1193}
1107 1194
1108sub button_up { 1195sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1110 1197
1111 delete $self->{motion}; 1198 !!delete $self->{motion}
1112} 1199}
1113 1200
1114sub mouse_motion { 1201sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1116 1203
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1118} 1207}
1119 1208
1120sub _draw { 1209sub _draw {
1121 my ($self) = @_; 1210 my ($self) = @_;
1122 1211
1212 my $child = $self->{children}[0];
1213
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1216
1126 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1219
1129 my $border = $self->border; 1220 my $border = $self->border;
1130 1221
1131 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1227
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1139 1230
1140 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1236 }
1151 1237
1152 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1153 1239
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1157} 1246}
1158 1247
1159############################################################################# 1248#############################################################################
1160 1249
1161package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1235 (sum @$hs), 1324 (sum @$hs),
1236 ) 1325 )
1237} 1326}
1238 1327
1239sub size_allocate { 1328sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1329 my ($self, $w, $h) = @_;
1241 1330
1242 my ($ws, $hs) = $self->get_wh; 1331 my ($ws, $hs) = $self->get_wh;
1243 1332
1244 my $req_w = (sum @$ws) || 1; 1333 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1334 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1413 )
1325} 1414}
1326 1415
1327sub size_allocate { 1416sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1417 my ($self, $w, $h) = @_;
1329 1418
1330 my $space = $self->{vertical} ? $h : $w; 1419 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1420 my $children = $self->{children};
1332 1421
1333 my @req; 1422 my @req;
… …
1416 ellipsise => 3, # end 1505 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1418 fontsize => 1, 1507 fontsize => 1,
1419 align => -1, 1508 align => -1,
1420 valign => -1, 1509 valign => -1,
1421 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1422 can_events => 0, 1512 can_events => 0,
1423 %arg 1513 %arg
1424 ); 1514 );
1425 1515
1426 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1453 1543
1454 delete $self->{texture}; 1544 delete $self->{texture};
1455 $self->SUPER::update; 1545 $self->SUPER::update;
1456} 1546}
1457 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1458sub set_text { 1555sub set_text {
1459 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1460 1557
1461 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1463 1560
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1466 1563
1564 delete $self->{req_h};
1467 $self->realloc; 1565 $self->realloc;
1468 $self->update; 1566 $self->update;
1469} 1567}
1470 1568
1471sub set_markup { 1569sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1576
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1481 1579
1580 delete $self->{req_h};
1482 $self->realloc; 1581 $self->realloc;
1483 $self->update; 1582 $self->update;
1484} 1583}
1485 1584
1486sub size_request { 1585sub size_request {
1487 my ($self) = @_; 1586 my ($self) = @_;
1488 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1596
1495 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1496 1598
1497 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1602
1501 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1502 1604
1503 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1505 } 1607 }
1506 1608
1609 ($w, $h)
1507 ( 1610 }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1611}
1512 1612
1513sub size_allocate { 1613sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1614 my ($self, $w, $h) = @_;
1615
1616 delete $self->{ox};
1515 1617
1516 delete $self->{texture} 1618 delete $self->{texture}
1517 if $changed; 1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1620}
1519 1621
1520sub set_fontsize { 1622sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1522 1624
… …
1537 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1643
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1543 1646
1647 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1547 1651
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1655 };
1554 1656
1555 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557 1658
1558 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1561 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563 } 1666 }
1564 1667
1565 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1566} 1669}
… …
1595 1698
1596 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1597 1700
1598 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1599 1702
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1704 $self->{text} = $text;
1604 1705
1605 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1607 1709
1608 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1609} 1714}
1610 1715
1611sub set_text { 1716sub set_text {
1612 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1613 1718
1614 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1720 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1721}
1619 1722
1620sub get_text { 1723sub get_text {
1621 $_[0]{text} 1724 $_[0]{text}
1622} 1725}
… …
1652 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1655 } elsif ($uni) { 1758 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1657 } 1762 }
1658 1763
1659 $self->_set_text ($text); 1764 $self->_set_text ($text);
1660 1765
1661 $self->realloc; 1766 $self->realloc;
1767
1768 1
1662} 1769}
1663 1770
1664sub focus_in { 1771sub focus_in {
1665 my ($self) = @_; 1772 my ($self) = @_;
1666 1773
… …
1681 utf8::encode $text; 1788 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1683 1790
1684 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1685 $self->update; 1792 $self->update;
1793
1794 1
1686} 1795}
1687 1796
1688sub mouse_motion { 1797sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1691} 1802}
1692 1803
1693sub _draw { 1804sub _draw {
1694 my ($self) = @_; 1805 my ($self) = @_;
1695 1806
1696 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1697 1808
1698 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1701 } else { 1812 } else {
1702 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1703 } 1814 }
1704 1815
1705 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1819 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1772 } else { 1883 } else {
1773 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1774 } 1885 }
1775 1886
1776 } else { 1887 } else {
1777 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1778 } 1891 1
1779
1780} 1892}
1781 1893
1782############################################################################# 1894#############################################################################
1783 1895
1784package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1793 1905
1794sub new { 1906sub new {
1795 my $class = shift; 1907 my $class = shift;
1796 1908
1797 $class->SUPER::new ( 1909 $class->SUPER::new (
1798 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1799 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1801 can_hover => 1, 1914 can_hover => 1,
1802 align => 0, 1915 align => 0,
1803 valign => 0, 1916 valign => 0,
… …
1812 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1813 1926
1814 $self->emit ("activate") 1927 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1817} 1932}
1818 1933
1819sub _draw { 1934sub _draw {
1820 my ($self) = @_; 1935 my ($self) = @_;
1821 1936
1822 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1938
1828 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1831 1942
… …
1850 1961
1851sub new { 1962sub new {
1852 my $class = shift; 1963 my $class = shift;
1853 1964
1854 $class->SUPER::new ( 1965 $class->SUPER::new (
1855 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1856 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1972 state => 0,
… …
1864} 1976}
1865 1977
1866sub size_request { 1978sub size_request {
1867 my ($self) = @_; 1979 my ($self) = @_;
1868 1980
1869 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1870} 1982}
1871 1983
1872sub button_down { 1984sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1874 1986
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1879 } 1995 1
1880} 1996}
1881 1997
1882sub _draw { 1998sub _draw {
1883 my ($self) = @_; 1999 my ($self) = @_;
1884 2000
1885 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1886 2002
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2004
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2008
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2010
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2012
… …
2049 2167
2050 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2052 2170
2053 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2176
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2166 vertical => 0, 2285 vertical => 0,
2167 can_hover => 1, 2286 can_hover => 1,
2168 inner_pad => 0.02, 2287 inner_pad => 0.02,
2169 @_ 2288 @_
2170 ); 2289 );
… …
2210} 2329}
2211 2330
2212sub size_request { 2331sub size_request {
2213 my ($self) = @_; 2332 my ($self) = @_;
2214 2333
2215 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2335}
2220 2336
2221sub button_down { 2337sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2223 2339
2224 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2225 2341
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2343
2228 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2229} 2345}
2230 2346
2231sub mouse_motion { 2347sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2233 2349
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2354
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2356
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2242 } 2362 1
2243} 2363}
2244 2364
2245sub update { 2365sub update {
2246 my ($self) = @_; 2366 my ($self) = @_;
2247 2367
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2250 2377
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2253 2380
… …
2259 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2261 2388
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2264 }); 2391 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2392
2272 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2273 2394
2274 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2275 2396
… …
2373 $self->{fontsize} = $fontsize; 2494 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2495 $self->reflow;
2375} 2496}
2376 2497
2377sub size_allocate { 2498sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2499 my ($self, $w, $h) = @_;
2379 2500
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2501 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2502
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2503 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2504 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2505 $self->{layout}->set_width ($self->{children}[0]{w});
2387 2506
… …
2471 2590
2472 delete $self->{texture}; 2591 delete $self->{texture};
2473 } 2592 }
2474 2593
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2478 2597
2479 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2480 2599
2481 my $y0 = $top; 2600 my $y0 = $top;
… …
2516sub _draw { 2635sub _draw {
2517 my ($self) = @_; 2636 my ($self) = @_;
2518 2637
2519 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2524 2643
2525 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2526 2645
2527} 2646}
… …
2610} 2729}
2611 2730
2612sub set_tooltip_from { 2731sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2614 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2615 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2746 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2748 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2757
2630 ($w + 4, $h + 4) 2758 ($w + 4, $h + 4)
2631} 2759}
2632 2760
2633sub size_allocate { 2761sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2762 my ($self, $w, $h) = @_;
2635 2763
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2765}
2640 2766
2641sub visibility_change { 2767sub visibility_change {
2642 my ($self, $visible) = @_; 2768 my ($self, $visible) = @_;
2643 2769
… …
2650 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2651 2777
2652 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2653 if $x + $self->{w} > $::WIDTH; 2779 if $x + $self->{w} > $::WIDTH;
2654 2780
2655 $self->move ($x, $y); 2781 $self->move_abs ($x, $y);
2656 }); 2782 });
2657} 2783}
2658 2784
2659sub _draw { 2785sub _draw {
2660 my ($self) = @_; 2786 my ($self) = @_;
… …
2747 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2748 2874
2749 if ($tex) { 2875 if ($tex) {
2750 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2752 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2753 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2754 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2755 } 2881 }
2756} 2882}
2757 2883
… …
2764 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2765} 2891}
2766 2892
2767############################################################################# 2893#############################################################################
2768 2894
2769package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2770 2896
2771our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2772 2898
2773sub new { 2899# TODO: should actualyl wrap buttons and other goodies.
2774 my $class = shift;
2775
2776 my $self = $class->SUPER::new (
2777 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2778 @_,
2779 );
2780
2781 $self
2782}
2783
2784sub set_items {
2785 my ($self, $items) = @_;
2786
2787 $self->{scrolled}->clear;
2788 return unless $items;
2789
2790 my @items = sort {
2791 ($a->{type} <=> $b->{type})
2792 or ($a->{name} cmp $b->{name})
2793 } @$items;
2794
2795 $self->{real_items} = \@items;
2796
2797 my $row = 0;
2798 for my $item (@items) {
2799 CFClient::Item::update_widgets $item;
2800
2801 $self->{scrolled}->add (0, $row, $item->{face_widget});
2802 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2803 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2804
2805 $row++;
2806 }
2807}
2808 2900
2809############################################################################# 2901#############################################################################
2810 2902
2811package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2812 2904
… …
2853 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2854 $GRAB = $self; 2946 $GRAB = $self;
2855 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2856 2948
2857 $self->show; 2949 $self->show;
2858 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2859} 2951}
2860 2952
2861sub mouse_motion { 2953sub mouse_motion {
2862 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2863 2955
2864 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2865 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2866 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2867} 2961}
2868 2962
2869sub button_up { 2963sub button_up {
2870 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2871 2965
… …
2873 undef $GRAB; 2967 undef $GRAB;
2874 $self->hide; 2968 $self->hide;
2875 2969
2876 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2877 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2878 } 2976 1
2879} 2977}
2880 2978
2881############################################################################# 2979#############################################################################
2882 2980
2883package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2884 2982
2885our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2886 2984
2887sub new { 2985sub new {
2888 my $class = shift; 2986 my $class = shift;
2889 2987
2890 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2891 fontsize => 0.8, 3097 fontsize => 0.8,
2892 @_, 3098 @_,
2893 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2894} 3106}
2895 3107
2896sub reorder { 3108sub reorder {
2897 my ($self) = @_; 3109 my ($self) = @_;
2898 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2899 3116
2900 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2901 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2902 } 3119 }
2903 3120
… …
2906 my @items = sort { 3123 my @items = sort {
2907 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2908 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2909 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2910 3127
3128 $self->{timer}->interval (1);
3129
2911 my $count = 10 + 1; 3130 my $count = 10 + 1;
2912 for my $item (@items) { 3131 for my $item (@items) {
2913 last unless --$count; 3132 last unless --$count;
2914 3133
2915 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2916 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2917 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2918 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2919 : $item->{text}; 3138 : $item->{text};
2920 3139
… …
2928 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2929 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2930 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2931 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2932 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2933 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2934 can_events => 1, 3153 can_events => 1,
2935 can_hover => 1 3154 can_hover => 1
2936 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2937 } 3168 }
2938 3169
2939 $self->clear; 3170 $self->clear;
2940 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2941} 3172}
… …
2946 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2947 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2948 3179
2949 return unless $text; 3180 return unless $text;
2950 3181
2951 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2952 3183
2953 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2954 3185
2955 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2956 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2986 3217
2987 $self->reorder; 3218 $self->reorder;
2988 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2989} 3220}
2990 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2991############################################################################# 3230#############################################################################
2992 3231
3232package CFClient::UI::Inventory;
3233
3234our @ISA = CFClient::UI::ScrolledWindow::;
3235
3236sub new {
3237 my $class = shift;
3238
3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3481 @_,
3482 )
3483}
3484
3485# XXX: Do sorting? Argl...
3486sub add_spell {
3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3489
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
2993package CFClient::UI::Root; 3527package CFClient::UI::Root;
2994 3528
2995our @ISA = CFClient::UI::Container::; 3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
2996 3532
2997use CFClient::OpenGL; 3533use CFClient::OpenGL;
2998 3534
2999sub new { 3535sub new {
3000 my $class = shift; 3536 my $class = shift;
… …
3007 Scalar::Util::weaken ($self->{root} = $self); 3543 Scalar::Util::weaken ($self->{root} = $self);
3008 3544
3009 $self 3545 $self
3010} 3546}
3011 3547
3012sub configure {
3013 my ($self, $x, $y, $w, $h) = @_;
3014
3015 $self->{w} = $w;
3016 $self->{h} = $h;
3017}
3018
3019sub reconfigure {
3020 my ($self) = @_;
3021
3022 $self->SUPER::reconfigure;
3023
3024 $self->size_allocate ($self->{w}, $self->{h}, 1)
3025 if $self->{w};
3026}
3027
3028sub size_request { 3548sub size_request {
3029 my ($self) = @_; 3549 my ($self) = @_;
3030 3550
3031 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3032} 3552}
3033 3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3566}
3567
3034sub size_allocate { 3568sub size_allocate {
3035 my ($self, $w, $h, $changed) = @_; 3569 my ($self, $w, $h) = @_;
3036 3570
3037 for my $child ($self->children) { 3571 for my $child ($self->children) {
3038 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3039 3573
3040 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3041 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3042 3576
3043 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3044 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
3045
3046 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3047
3048 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3049 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3050 3579
3051 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3052 } 3581 }
3053} 3582}
3054 3583
… …
3071} 3600}
3072 3601
3073sub add { 3602sub add {
3074 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3075 3604
3076 for my $child (@children) {
3077 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3078 3606 for @children;
3079 # integerise window positions
3080 $child->{x} = int $child->{x};
3081 $child->{y} = int $child->{y};
3082 }
3083 3607
3084 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3085} 3609}
3086 3610
3087sub remove { 3611sub remove {
3088 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3089 3613
3090 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3091 3618
3092 while (@children) { 3619 while (@children) {
3093 my $w = pop @children; 3620 my $w = pop @children;
3094 push @children, $w->children; 3621 push @children, $w->children;
3095 $w->set_invisible; 3622 $w->set_invisible;
… …
3115 $_->() 3642 $_->()
3116 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3117 } 3644 }
3118 3645
3119 if ($self->{realloc}) { 3646 if ($self->{realloc}) {
3647 my %queue;
3120 my @queue; 3648 my @queue;
3649 my $widget;
3121 3650
3651 outer:
3122 while () { 3652 while () {
3123 if ($self->{realloc}) { 3653 if (my $realloc = delete $self->{realloc}) {
3124 #TODO use array-of-depth approach 3654 for $widget (values %$realloc) {
3655 $widget->{visible} or next; # do not resize invisible widgets
3125 3656
3126 @queue = sort { $a->{visible} <=> $b->{visible} } 3657 $queue{$widget+0}++ and next; # duplicates are common
3127 @queue, values %{delete $self->{realloc}}; 3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3128 } 3661 }
3129 3662
3663 while () {
3664 @queue or last outer;
3665
3666 $widget = pop @{ $queue[-1] || [] }
3667 and last;
3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3687 $widget->{req_w} = $w;
3688 $widget->{req_h} = $h;
3689
3690 $self->{size_alloc}{$widget+0} = $widget;
3691
3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3702 }
3703 }
3704
3705 while (my $size_alloc = delete $self->{size_alloc}) {
3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3707 values %$size_alloc;
3708
3709 while () {
3130 my $widget = pop @queue || last; 3710 my $widget = pop @queue || last;
3131 3711
3132 $widget->{visible} or last; # do not resize invisible widgets 3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3133
3134 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3135 ? @$widget{qw(def_w def_h)}
3136 : $widget->size_request;
3137
3138 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3139
3140 $widget->{req_w} = $w;
3141 $widget->{req_h} = $h;
3142
3143 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3144
3145 push @queue, $widget->{parent}
3146 if $widget->{parent};
3147 }
3148 }
3149
3150 while (my $size_alloc = delete $self->{size_alloc}) {
3151 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3152 values %$size_alloc;
3153
3154 while () {
3155 my ($widget, $w, $h) = @{ pop @queue or last };
3156 3713
3157 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3158 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3159 3716
3160 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3161 3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3162 $widget->{w} = $w; 3724 $widget->{w} = $w;
3163 $widget->{h} = $h; 3725 $widget->{h} = $h;
3164 3726
3165 $widget->emit (size_allocate => $w, $h, $changed); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3166 } 3729 }
3167 } 3730 }
3168 3731
3169 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3170 $_->() 3733 $_->()
3171 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3172 } 3735 }
3736
3173 3737
3174 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3175 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3176 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3177 3741
… …
3179 glLoadIdentity; 3743 glLoadIdentity;
3180 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3181 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3182 glLoadIdentity; 3746 glLoadIdentity;
3183 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3184 $self->_draw; 3755 $self->_draw;
3185} 3756}
3186 3757
3187############################################################################# 3758#############################################################################
3188 3759

Diff Legend

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