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.232 by root, Thu May 25 02:23:14 2006 UTC vs.
Revision 1.273 by root, Sat Jun 3 02:32:35 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
152sub rescale_widgets { 171sub rescale_widgets {
153 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
154 173
155 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
165 } 189 }
166 } 190 }
167 191
168 reconfigure_widgets; 192 reconfigure_widgets;
169} 193}
… …
178 202
179sub new { 203sub new {
180 my $class = shift; 204 my $class = shift;
181 205
182 my $self = bless { 206 my $self = bless {
183 x => 0, 207 x => "center",
184 y => 0, 208 y => "center",
185 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
186 can_events => 1, 212 can_events => 1,
187 @_ 213 @_
188 }, $class; 214 }, $class;
189 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
190 for (keys %$self) { 218 for (keys %$self) {
191 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
193 } 221 }
194 } 222 }
195 223
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
197 235
198 $self 236 $self
199} 237}
200 238
201sub destroy { 239sub destroy {
… …
205 %$self = (); 243 %$self = ();
206} 244}
207 245
208sub show { 246sub show {
209 my ($self) = @_; 247 my ($self) = @_;
248
210 return if $self->{parent}; 249 return if $self->{parent};
211 250
212 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
213} 252}
214 253
215sub show_centered { 254sub set_visible {
216 my ($self) = @_; 255 my ($self) = @_;
256
217 return if $self->{parent}; 257 return if $self->{visible};
218 258
219 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
220 261
221 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 263
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 264 $self->realloc if !exists $self->{req_w};
224 }, 265
225 ); 266 $_->set_visible for $self->children;
226} 267}
227 268
228sub set_invisible { 269sub set_invisible {
229 my ($self) = @_; 270 my ($self) = @_;
230 271
231 # broken show/hide model 272 return unless $self->{visible};
232 273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
233 delete $self->{visible}; 277 delete $self->{visible};
234 278
235 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
237 281
238 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
240 284
241 $self->focus_out; 285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
242} 305}
243 306
244sub hide { 307sub hide {
245 my ($self) = @_; 308 my ($self) = @_;
246 309
… …
248 311
249 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
250 if $self->{parent}; 313 if $self->{parent};
251} 314}
252 315
253sub move { 316sub move_abs {
254 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
255 318
256 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
259 322
260 $self->update; 323 $self->update;
261} 324}
262 325
263sub set_size { 326sub set_size {
264 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
265 328
266 $self->{user_w} = $w; 329 $self->{force_w} = $w;
267 $self->{user_h} = $h; 330 $self->{force_h} = $h;
268 331
269 $self->check_size; 332 $self->realloc;
270} 333}
271 334
272sub size_request { 335sub size_request {
273 require Carp; 336 require Carp;
274 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
276 339
277sub configure { 340sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
279 342
280 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
283 348
284 # use alignment to adjust x, y 349 # use alignment to adjust x, y
285 350
286 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 353 }
291 354
292 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 356 $self->{x} = $x;
294 $self->{y} = $y; 357 $self->{y} = $y;
295 $self->update; 358 $self->update;
296 } 359 }
297 360
298 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
300 } 368 }
301} 369}
302 370
303sub size_allocate { 371sub size_allocate {
304 # nothing to be done 372 # nothing to be done
305} 373}
306 374
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
315} 381}
316 382
317sub set_max_size { 383sub set_max_size {
318 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
319 385
… …
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
322} 388}
323 389
324sub set_tooltip { 390sub set_tooltip {
325 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
326 397
327 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
328 399
329 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
330 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
373 444
374 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
375 unless $FOCUS; 446 unless $FOCUS;
376} 447}
377 448
378sub mouse_motion { } 449sub mouse_motion { 0 }
379sub button_up { } 450sub button_up { 0 }
380sub key_down { } 451sub key_down { 0 }
381sub key_up { } 452sub key_up { 0 }
382 453
383sub button_down { 454sub button_down {
384 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
385 456
386 $self->focus_in; 457 $self->focus_in;
387}
388 458
389sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
390sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
391sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
392sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
393sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
394 535
395sub draw { 536sub draw {
396 my ($self) = @_; 537 my ($self) = @_;
397 538
398 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
399 550
400 glPushMatrix; 551 glPushMatrix;
401 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
402 $self->_draw; 553 $self->_draw;
403 glPopMatrix; 554 glPopMatrix;
… …
415 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
416 glEnd; 567 glEnd;
417 glDisable GL_BLEND; 568 glDisable GL_BLEND;
418 } 569 }
419 570
420 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
421 glPushMatrix; 572 glPushMatrix;
422 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
423 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
424 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
425 glVertex 0 , 0; 576 glVertex 0 , 0;
426 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
427 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
428 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
429 glEnd; 580 glEnd;
430 glPopMatrix; 581 glPopMatrix;
431 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
432 } 583 }
433} 584}
434 585
435sub _draw { 586sub _draw {
436 my ($self) = @_; 587 my ($self) = @_;
437 588
438 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
439}
440
441sub find_widget {
442 my ($self, $x, $y) = @_;
443
444 return () unless $self->{can_events};
445
446 return $self
447 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
448 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
449
450 ()
451}
452
453sub set_parent {
454 my ($self, $parent) = @_;
455
456 Scalar::Util::weaken ($self->{parent} = $parent);
457
458 # TODO: req_w _does_change after ->reconfigure
459 $self->check_size
460 unless exists $self->{req_w};
461
462 $self->show;
463}
464
465sub check_size {
466 my ($self, $forced) = @_;
467
468 $self->{force_alloc} = 1 if $forced;
469 $CFClient::UI::ROOT->{check_size}{$self} = $self;
470}
471
472sub update {
473 my ($self) = @_;
474
475 $self->{parent}->update
476 if $self->{parent};
477}
478
479sub connect {
480 my ($self, $signal, $cb) = @_;
481
482 push @{ $self->{signal_cb}{$signal} }, $cb;
483}
484
485sub _emit {
486 my ($self, $signal, @args) = @_;
487
488 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
489}
490
491sub emit {
492 my ($self, $signal, @args) = @_;
493
494 $self->_emit ($signal, @args)
495 || $self->$signal (@args);
496} 590}
497 591
498sub DESTROY { 592sub DESTROY {
499 my ($self) = @_; 593 my ($self) = @_;
500 594
… …
558 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
559 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
560} 654}
561 655
562sub size_request { 656sub size_request {
563 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
564} 660}
565 661
566sub draw { } 662sub draw { }
567 663
568############################################################################# 664#############################################################################
… …
572our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
573 669
574sub new { 670sub new {
575 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
576 672
577 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
578 674
579 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
580 children => [], 676 children => [],
581 can_events => 0, 677 can_events => 0,
582 %arg, 678 %arg,
583 ); 679 );
680
584 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
585 683
586 $self 684 $self
587} 685}
588 686
589sub add { 687sub add {
… …
597 $self->{children} = [ 695 $self->{children} = [
598 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
599 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
600 ]; 698 ];
601 699
602 $self->check_size (1); 700 $self->realloc;
603 $self->update;
604} 701}
605 702
606sub children { 703sub children {
607 @{ $_[0]{children} } 704 @{ $_[0]{children} }
608} 705}
… …
613 delete $child->{parent}; 710 delete $child->{parent};
614 $child->hide; 711 $child->hide;
615 712
616 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
617 714
618 $self->check_size; 715 $self->realloc;
619 $self->update;
620} 716}
621 717
622sub clear { 718sub clear {
623 my ($self) = @_; 719 my ($self) = @_;
624 720
… …
628 for (@$children) { 724 for (@$children) {
629 delete $_->{parent}; 725 delete $_->{parent};
630 $_->hide; 726 $_->hide;
631 } 727 }
632 728
633 $self->check_size; 729 $self->realloc;
634 $self->update;
635} 730}
636 731
637sub find_widget { 732sub find_widget {
638 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
639 734
640 $x -= $self->{x}; 735 $x -= $self->{x};
641 $y -= $self->{y}; 736 $y -= $self->{y};
642 737
643 my $res; 738 my $res;
644 739
645 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
646 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
647 and return $res; 742 and return $res;
648 } 743 }
649 744
650 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
726 $self->SUPER::size_allocate ($w, $h); 821 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 822 $self->update;
728} 823}
729 824
730sub _render { 825sub _render {
826 my ($self) = @_;
827
731 $_[0]{children}[0]->draw; 828 $self->{children}[0]->draw;
732} 829}
733 830
734sub render_child { 831sub render_child {
735 my ($self) = @_; 832 my ($self) = @_;
736 833
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 834 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0; 835 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 836 glClear GL_COLOR_BUFFER_BIT;
740 837
838 {
839 package CFClient::UI::Base;
840
841 ($draw_x, $draw_y, $draw_w, $draw_h) =
842 (0, 0, $self->{w}, $self->{h});
843 }
844
741 $self->_render; 845 $self->_render;
742 }; 846 };
743} 847}
744 848
745sub _draw { 849sub _draw {
746 my ($self) = @_; 850 my ($self) = @_;
747 851
748 my ($w, $h) = ($self->w, $self->h); 852 my ($w, $h) = @$self{qw(w h)};
749 853
750 my $tex = $self->{texture} 854 my $tex = $self->{texture}
751 or return; 855 or return;
752 856
753 glEnable GL_TEXTURE_2D; 857 glEnable GL_TEXTURE_2D;
… …
763 867
764package CFClient::UI::ViewPort; 868package CFClient::UI::ViewPort;
765 869
766our @ISA = CFClient::UI::Window::; 870our @ISA = CFClient::UI::Window::;
767 871
872sub new {
873 my $class = shift;
874
875 $class->SUPER::new (
876 scroll_x => 0,
877 scroll_y => 1,
878 @_,
879 )
880}
881
768sub size_request { 882sub size_request {
769 my ($self) = @_; 883 my ($self) = @_;
770 884
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 885 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 886
773 @$self{qw(child_w child_h)} 887 $w = 10 if $self->{scroll_x};
888 $h = 10 if $self->{scroll_y};
889
890 ($w, $h)
774} 891}
775 892
776sub size_allocate { 893sub size_allocate {
777 my ($self, $w, $h) = @_; 894 my ($self, $w, $h) = @_;
778 895
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 896 my $child = $self->child;
780# $w = $self->{w}; 897
898 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
899 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
900
781 $self->child->configure (0, 0, $cw, $ch); 901 $self->child->configure (0, 0, $w, $h);
782 $self->update; 902 $self->update;
783} 903}
784 904
785sub set_offset { 905sub set_offset {
786 my ($self, $x, $y) = @_; 906 my ($self, $x, $y) = @_;
… …
820} 940}
821 941
822sub _render { 942sub _render {
823 my ($self) = @_; 943 my ($self) = @_;
824 944
945 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
946 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
947
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 948 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 949
827 $self->SUPER::_render; 950 $self->SUPER::_render;
828} 951}
829 952
… …
832package CFClient::UI::ScrolledWindow; 955package CFClient::UI::ScrolledWindow;
833 956
834our @ISA = CFClient::UI::HBox::; 957our @ISA = CFClient::UI::HBox::;
835 958
836sub new { 959sub new {
837 my $class = shift; 960 my ($class, %arg) = @_;
961
962 my $child = delete $arg{child};
838 963
839 my $self; 964 my $self;
840 965
841 my $slider = new CFClient::UI::Slider 966 my $slider = new CFClient::UI::Slider
842 vertical => 1, 967 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 968 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 969 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 970 $self->{vp}->set_offset (0, $_[1]);
846 }, 971 },
847 ; 972 ;
848 973
849 $self = $class->SUPER::new ( 974 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 975 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 976 slider => $slider,
852 @_, 977 %arg,
853 ); 978 );
854 979
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 980 $self->SUPER::add ($self->{vp}, $self->{slider});
981 $self->add ($child) if $child;
858 982
859 $self 983 $self
984}
985
986sub add {
987 my ($self, $widget) = @_;
988
989 $self->{vp}->add ($self->{child} = $widget);
990}
991
992sub update {
993 my ($self) = @_;
994
995 $self->SUPER::update;
996
997 # todo: overwrite size_allocate of child
998 my $child = $self->{vp}->child;
999 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 1000}
861 1001
862sub size_allocate { 1002sub size_allocate {
863 my ($self, $w, $h) = @_; 1003 my ($self, $w, $h) = @_;
864 1004
… …
917 1057
918our @ISA = CFClient::UI::Bin::; 1058our @ISA = CFClient::UI::Bin::;
919 1059
920use CFClient::OpenGL; 1060use CFClient::OpenGL;
921 1061
922my @tex = 1062my $bg =
1063 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1064 mipmap => 1, wrap => 1;
1065
1066my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1067 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
924 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1068 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1069
926sub new { 1070sub new {
927 my $class = shift; 1071 my ($class, %arg) = @_;
928 1072
929 # TODO: user_x, user_y, overwrite moveto? 1073 my $title = delete $arg{title};
930 1074
931 my $self = $class->SUPER::new ( 1075 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1076 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1077 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1078 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1079 can_events => 1,
937 @_ 1080 min_w => 16,
1081 min_h => 16,
1082 %arg,
938 ); 1083 );
939 1084
940 $self->{title} &&= new CFClient::UI::Label 1085 $self->{title} = new CFClient::UI::Label
941 align => 0, 1086 align => 0,
942 valign => 1, 1087 valign => 1,
943 text => $self->{title}, 1088 text => $title,
944 fontsize => $self->{border}; 1089 fontsize => $self->{border}
1090 if defined $title;
945 1091
946 $self 1092 $self
1093}
1094
1095sub add {
1096 my ($self, @widgets) = @_;
1097
1098 $self->SUPER::add (@widgets);
1099 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
947} 1100}
948 1101
949sub border { 1102sub border {
950 int $_[0]{border} * $::FONTSIZE 1103 int $_[0]{border} * $::FONTSIZE
951} 1104}
952 1105
953sub size_request { 1106sub size_request {
954 my ($self) = @_; 1107 my ($self) = @_;
1108
1109 $self->{title}->size_request
1110 if $self->{title};
955 1111
956 my ($w, $h) = $self->SUPER::size_request; 1112 my ($w, $h) = $self->SUPER::size_request;
957 1113
958 ( 1114 (
959 $w + $self->border * 2, 1115 $w + $self->border * 2,
… …
962} 1118}
963 1119
964sub size_allocate { 1120sub size_allocate {
965 my ($self, $w, $h) = @_; 1121 my ($self, $w, $h) = @_;
966 1122
1123 if ($self->{title}) {
1124 $self->{title}{w} = $w;
1125 $self->{title}{h} = $h;
1126 $self->{title}->size_allocate ($w, $h);
1127 }
1128
1129 my $border = $self->border;
1130
967 $h -= List::Util::max 0, $self->border * 2; 1131 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1132 $w -= List::Util::max 0, $border * 2;
969 1133
970 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
971 if $self->{title};
972
973 $self->child->configure ($self->border, $self->border, $w, $h); 1134 $self->child->configure ($border, $border, $w, $h);
974} 1135}
975 1136
976sub button_down { 1137sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1138 my ($self, $ev, $x, $y) = @_;
978 1139
… …
994 my ($ev, $x, $y) = @_; 1155 my ($ev, $x, $y) = @_;
995 1156
996 my $dx = $ev->{x} - $ox; 1157 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1158 my $dy = $ev->{y} - $oy;
998 1159
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1160 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1161 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1162
1163 $self->realloc;
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size;
1003 }; 1165 };
1004 1166
1005 } elsif ($lr ^ $td) { 1167 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1168 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1169 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1171 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1172 my ($ev, $x, $y) = @_;
1011 1173
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1174 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1175
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1176 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update;
1016 }; 1177 };
1178 } else {
1179 return 0;
1180 }
1181
1017 } 1182 1
1018} 1183}
1019 1184
1020sub button_up { 1185sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1186 my ($self, $ev, $x, $y) = @_;
1022 1187
1023 delete $self->{motion}; 1188 !!delete $self->{motion}
1024} 1189}
1025 1190
1026sub mouse_motion { 1191sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1028 1193
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1194 $self->{motion}->($ev, $x, $y) if $self->{motion};
1195
1196 !!$self->{motion}
1030} 1197}
1031 1198
1032sub _draw { 1199sub _draw {
1033 my ($self) = @_; 1200 my ($self) = @_;
1034 1201
1202 my $child = $self->{children}[0];
1203
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1204 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1205 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1206
1038 glEnable GL_TEXTURE_2D; 1207 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1208 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1209
1041 my $border = $self->border; 1210 my $border = $self->border;
1042 1211
1043 glColor @{ $self->{border_bg} }; 1212 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1213 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1214 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1215 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1216 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1217
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1218 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1219 glColor @{ $self->{bg} };
1051 1220
1052 # TODO: repeat texture not scale 1221 # TODO: repeat texture not scale
1222 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1223 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1224 $bg->{t} = $ch / $bg->{h};
1055
1056 glColor @{ $self->{bg} };
1057
1058 $bg->{s} = $rep_x;
1059 $bg->{t} = $rep_y;
1060 $bg->{wrap_mode} = 1;
1061 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1225 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1226 }
1063 1227
1064 glDisable GL_TEXTURE_2D; 1228 glDisable GL_TEXTURE_2D;
1065 1229
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1230 $child->draw;
1231
1232 if ($self->{title}) {
1233 glTranslate 0, $border - $self->{h};
1234 $self->{title}->_draw;
1235 }
1069} 1236}
1070 1237
1071############################################################################# 1238#############################################################################
1072 1239
1073package CFClient::UI::Table; 1240package CFClient::UI::Table;
… …
1081sub new { 1248sub new {
1082 my $class = shift; 1249 my $class = shift;
1083 1250
1084 $class->SUPER::new ( 1251 $class->SUPER::new (
1085 col_expand => [], 1252 col_expand => [],
1086 @_ 1253 @_,
1087 ) 1254 )
1255}
1256
1257sub children {
1258 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1259}
1089 1260
1090sub add { 1261sub add {
1091 my ($self, $x, $y, $child) = @_; 1262 my ($self, $x, $y, $child) = @_;
1092 1263
1093 $child->set_parent ($self); 1264 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1265 $self->{children}[$y][$x] = $child;
1095 1266
1096 $child->check_size; 1267 $self->realloc;
1097} 1268}
1098 1269
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1270# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1271sub clear {
1105 my ($self) = @_; 1272 my ($self) = @_;
1106 1273
1107 my @children = $self->children; 1274 my @children = $self->children;
1108 delete $self->{children}; 1275 delete $self->{children};
… …
1110 for (@children) { 1277 for (@children) {
1111 delete $_->{parent}; 1278 delete $_->{parent};
1112 $_->hide; 1279 $_->hide;
1113 } 1280 }
1114 1281
1115 $self->update; 1282 $self->realloc;
1116} 1283}
1117 1284
1118sub get_wh { 1285sub get_wh {
1119 my ($self) = @_; 1286 my ($self) = @_;
1120 1287
… …
1151sub size_allocate { 1318sub size_allocate {
1152 my ($self, $w, $h) = @_; 1319 my ($self, $w, $h) = @_;
1153 1320
1154 my ($ws, $hs) = $self->get_wh; 1321 my ($ws, $hs) = $self->get_wh;
1155 1322
1156 my $req_w = sum @$ws; 1323 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1324 my $req_h = (sum @$hs) || 1;
1158 1325
1159 # TODO: nicer code && do row_expand 1326 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1327 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1328 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1329 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1383 }
1217} 1384}
1218 1385
1219############################################################################# 1386#############################################################################
1220 1387
1221package CFClient::UI::HBox; 1388package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1389
1225our @ISA = CFClient::UI::Container::; 1390our @ISA = CFClient::UI::Container::;
1226 1391
1227sub size_request { 1392sub size_request {
1228 my ($self) = @_; 1393 my ($self) = @_;
1229 1394
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1395 $self->{vertical}
1231 1396 ? (
1232 ( 1397 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1398 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1399 )
1235 ) 1400 : (
1401 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1402 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1403 )
1236} 1404}
1237 1405
1238sub size_allocate { 1406sub size_allocate {
1239 my ($self, $w, $h) = @_; 1407 my ($self, $w, $h) = @_;
1240 1408
1241 ($h, $w) = ($w, $h); 1409 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1410 my $children = $self->{children};
1244 1411
1245 my @h = map $_->{req_w}, @$children; 1412 my @req;
1246 1413
1247 my $req_h = List::Util::sum @h; 1414 if ($self->{homogeneous}) {
1248 1415 @req = ($space / (@$children || 1)) x @$children;
1249 if ($req_h > $h) {
1250 # ah well, not enough space
1251 $_ *= $h / $req_h for @h;
1252 } else { 1416 } else {
1417 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1418 my $req = List::Util::sum @req;
1419
1420 if ($req > $space) {
1421 # ah well, not enough space
1422 $_ *= $space / $req for @req;
1423 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1424 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1425
1426 $space = ($space - $req) / $expand; # remaining space to give away
1427
1428 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1429 for 0 .. $#$children;
1257 my $child = $children->[$_];
1258
1259 my $alloc_h = $h[$_];
1260 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1261 $h[$_] = $alloc_h;
1262 } 1430 }
1263 } 1431 }
1264 1432
1265 CFClient::UI::harmonize \@h; 1433 CFClient::UI::harmonize \@req;
1266 1434
1267 my $y = 0; 1435 my $pos = 0;
1268 for (0 .. $#$children) { 1436 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1437 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1438 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1439
1273 $y += $h; 1440 $pos += $alloc;
1274 } 1441 }
1275 1442
1276 1 1443 1
1277} 1444}
1278 1445
1279############################################################################# 1446#############################################################################
1280 1447
1448package CFClient::UI::HBox;
1449
1450our @ISA = CFClient::UI::Box::;
1451
1452sub new {
1453 my $class = shift;
1454
1455 $class->SUPER::new (
1456 vertical => 0,
1457 @_,
1458 )
1459}
1460
1461#############################################################################
1462
1281package CFClient::UI::VBox; 1463package CFClient::UI::VBox;
1282 1464
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1465our @ISA = CFClient::UI::Box::;
1286 1466
1287sub size_request { 1467sub new {
1288 my ($self) = @_; 1468 my $class = shift;
1289 1469
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1470 $class->SUPER::new (
1291 1471 vertical => 1,
1292 ( 1472 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1473 )
1296}
1297
1298sub size_allocate {
1299 my ($self, $w, $h) = @_;
1300
1301 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1302
1303 my $children = $self->{children};
1304
1305 my @h = map $_->{req_h}, @$children;
1306
1307 my $req_h = List::Util::sum @h;
1308
1309 if ($req_h > $h) {
1310 # ah well, not enough space
1311 $_ *= $h / $req_h for @h;
1312 } else {
1313 my $exp = List::Util::sum map $_->{expand}, @$children;
1314 $exp ||= 1;
1315
1316 for (0 .. $#$children) {
1317 my $child = $children->[$_];
1318
1319 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1320 }
1321 }
1322
1323 CFClient::UI::harmonize \@h;
1324
1325 my $y = 0;
1326 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_];
1329 $child->configure (0, $y, $w, $h);
1330
1331 $y += $h;
1332 }
1333
1334 1
1335} 1474}
1336 1475
1337############################################################################# 1476#############################################################################
1338 1477
1339package CFClient::UI::Label; 1478package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1495 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1496 layout => (new CFClient::Layout),
1358 fontsize => 1, 1497 fontsize => 1,
1359 align => -1, 1498 align => -1,
1360 valign => -1, 1499 valign => -1,
1361 padding => 2, 1500 padding_x => 2,
1501 padding_y => 2,
1362 can_events => 0, 1502 can_events => 0,
1363 %arg 1503 %arg
1364 ); 1504 );
1365 1505
1366 if (exists $self->{template}) { 1506 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1542 $self->{text} = "T$text";
1403 1543
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1544 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1545 $self->{layout}->set_text ($text);
1406 1546
1547 $self->realloc;
1407 $self->update; 1548 $self->update;
1408 $self->check_size;
1409} 1549}
1410 1550
1411sub set_markup { 1551sub set_markup {
1412 my ($self, $markup) = @_; 1552 my ($self, $markup) = @_;
1413 1553
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1557 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1558
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1559 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1560 $self->{layout}->set_markup ($markup);
1421 1561
1562 $self->realloc;
1422 $self->update; 1563 $self->update;
1423 $self->check_size;
1424} 1564}
1425 1565
1426sub size_request { 1566sub size_request {
1427 my ($self) = @_; 1567 my ($self) = @_;
1428 1568
… …
1442 1582
1443 $w = List::Util::max $w, $w2; 1583 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1584 $h = List::Util::max $h, $h2;
1445 } 1585 }
1446 1586
1447 ( 1587 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1588}
1452 1589
1453sub size_allocate { 1590sub size_allocate {
1454 my ($self, $w, $h) = @_; 1591 my ($self, $w, $h) = @_;
1455 1592
1593 delete $self->{ox};
1594
1456 delete $self->{texture}; 1595 delete $self->{texture}
1596 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1597}
1458 1598
1459sub set_fontsize { 1599sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1600 my ($self, $fontsize) = @_;
1461 1601
1462 $self->{fontsize} = $fontsize; 1602 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1603 delete $self->{texture};
1464 1604
1465 $self->update; 1605 $self->realloc;
1466 $self->check_size;
1467} 1606}
1468 1607
1469sub _draw { 1608sub _draw {
1470 my ($self) = @_; 1609 my ($self) = @_;
1471 1610
… …
1477 $self->{layout}->set_width ($self->{w}); 1616 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1617 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1618 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1619 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1620
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1621 new_from_layout CFClient::Texture $self->{layout}
1622 };
1483 1623
1624 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1625 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1626 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1627 : ($self->{w} - $tex->{w}) * 0.5);
1487 1628
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1629 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1630 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1631 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1632 };
1494 1633
1495 glEnable GL_TEXTURE_2D; 1634 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1636
… …
1551sub set_text { 1690sub set_text {
1552 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1553 1692
1554 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1694 $self->_set_text ($text);
1556 $self->update; 1695
1557 $self->check_size; 1696 $self->realloc;
1558} 1697}
1559 1698
1560sub get_text { 1699sub get_text {
1561 $_[0]{text} 1700 $_[0]{text}
1562} 1701}
… …
1592 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1733 $self->_emit ('escape');
1595 } elsif ($uni) { 1734 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1597 } 1738 }
1598 1739
1599 $self->_set_text ($text); 1740 $self->_set_text ($text);
1600 $self->update; 1741
1601 $self->check_size; 1742 $self->realloc;
1743
1744 1
1602} 1745}
1603 1746
1604sub focus_in { 1747sub focus_in {
1605 my ($self) = @_; 1748 my ($self) = @_;
1606 1749
… …
1621 utf8::encode $text; 1764 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1765 $self->{cursor} = length substr $text, 0, $idx;
1623 1766
1624 $self->_set_text ($self->{text}); 1767 $self->_set_text ($self->{text});
1625 $self->update; 1768 $self->update;
1769
1770 1
1626} 1771}
1627 1772
1628sub mouse_motion { 1773sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1774 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1775# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1776
1777 0
1631} 1778}
1632 1779
1633sub _draw { 1780sub _draw {
1634 my ($self) = @_; 1781 my ($self) = @_;
1635 1782
… …
1712 } else { 1859 } else {
1713 $self->set_text ($self->{history_saveback}); 1860 $self->set_text ($self->{history_saveback});
1714 } 1861 }
1715 1862
1716 } else { 1863 } else {
1717 $self->SUPER::key_down ($ev); 1864 return $self->SUPER::key_down ($ev)
1865 }
1866
1718 } 1867 1
1719
1720} 1868}
1721 1869
1722############################################################################# 1870#############################################################################
1723 1871
1724package CFClient::UI::Button; 1872package CFClient::UI::Button;
… …
1733 1881
1734sub new { 1882sub new {
1735 my $class = shift; 1883 my $class = shift;
1736 1884
1737 $class->SUPER::new ( 1885 $class->SUPER::new (
1738 padding => 4, 1886 padding_x => 4,
1887 padding_y => 4,
1739 fg => [1, 1, 1], 1888 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1889 active_fg => [0, 0, 1],
1741 can_hover => 1, 1890 can_hover => 1,
1742 align => 0, 1891 align => 0,
1743 valign => 0, 1892 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1901 my ($self, $ev, $x, $y) = @_;
1753 1902
1754 $self->emit ("activate") 1903 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1904 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1905 && $y >= 0 && $y < $self->{h};
1906
1907 1
1757} 1908}
1758 1909
1759sub _draw { 1910sub _draw {
1760 my ($self) = @_; 1911 my ($self) = @_;
1761 1912
… …
1790 1941
1791sub new { 1942sub new {
1792 my $class = shift; 1943 my $class = shift;
1793 1944
1794 $class->SUPER::new ( 1945 $class->SUPER::new (
1795 padding => 2, 1946 padding_x => 2,
1947 padding_y => 2,
1796 fg => [1, 1, 1], 1948 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1949 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1950 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1951 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1952 state => 0,
… …
1804} 1956}
1805 1957
1806sub size_request { 1958sub size_request {
1807 my ($self) = @_; 1959 my ($self) = @_;
1808 1960
1809 ($self->{padding} * 2 + 6) x 2 1961 (6) x 2
1810} 1962}
1811 1963
1812sub button_down { 1964sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1965 my ($self, $ev, $x, $y) = @_;
1814 1966
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1967 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1968 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1969 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1970 $self->_emit (changed => $self->{state});
1971 } else {
1972 return 0
1973 }
1974
1819 } 1975 1
1820} 1976}
1821 1977
1822sub _draw { 1978sub _draw {
1823 my ($self) = @_; 1979 my ($self) = @_;
1824 1980
1825 $self->SUPER::_draw; 1981 $self->SUPER::_draw;
1826 1982
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1983 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1984
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1985 my ($w, $h) = @$self{qw(w h)};
1986
1987 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1988
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1989 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1990
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1991 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1992
… …
2099 fg => [1, 1, 1], 2257 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2258 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2259 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2260 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2261 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2262 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2263 min_h => $::WIDTH / 80,
2106 vertical => 0, 2264 vertical => 0,
2107 can_hover => 1, 2265 can_hover => 1,
2108 inner_pad => 0.02, 2266 inner_pad => 0.02,
2109 @_ 2267 @_
2110 ); 2268 );
… …
2113 $self->update; 2271 $self->update;
2114 2272
2115 $self 2273 $self
2116} 2274}
2117 2275
2276sub changed { }
2277
2118sub set_range { 2278sub set_range {
2119 my ($self, $range) = @_; 2279 my ($self, $range) = @_;
2120 2280
2121 $self->{range} = $range; 2281 ($range, $self->{range}) = ($self->{range}, $range);
2122 2282
2123 $self->update; 2283 $self->update
2284 if "@$range" ne "@{$self->{range}}";
2124} 2285}
2125 2286
2126sub set_value { 2287sub set_value {
2127 my ($self, $value) = @_; 2288 my ($self, $value) = @_;
2128 2289
… …
2147} 2308}
2148 2309
2149sub size_request { 2310sub size_request {
2150 my ($self) = @_; 2311 my ($self) = @_;
2151 2312
2152 my $w = $self->{req_w}; 2313 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2314}
2157 2315
2158sub button_down { 2316sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2317 my ($self, $ev, $x, $y) = @_;
2160 2318
2161 $self->SUPER::button_down ($ev, $x, $y); 2319 $self->SUPER::button_down ($ev, $x, $y);
2162 2320
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2321 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2322
2165 $self->mouse_motion ($ev, $x, $y); 2323 $self->mouse_motion ($ev, $x, $y)
2166} 2324}
2167 2325
2168sub mouse_motion { 2326sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2327 my ($self, $ev, $x, $y) = @_;
2170 2328
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2332 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2333
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2334 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2335
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2336 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2337 } else {
2338 return 0;
2339 }
2340
2179 } 2341 1
2180} 2342}
2181 2343
2182sub update { 2344sub update {
2183 my ($self) = @_; 2345 my ($self) = @_;
2184 2346
… …
2511 2673
2512sub new { 2674sub new {
2513 my $class = shift; 2675 my $class = shift;
2514 2676
2515 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2516 state => 0, 2678 state => 0,
2517 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2518 @_ 2680 @_
2519 ); 2681 );
2520 2682
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2683 $self
2527} 2684}
2528 2685
2529sub toggle_flopper { 2686sub toggle_flopper {
2530 my ($self) = @_; 2687 my ($self) = @_;
2531 2688
2532 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2533 if ($self->{state} = !$self->{state}) {
2534 $CFClient::UI::ROOT->add ($self->{other});
2535 $self->{other}->move ($self->coord2global (0, $self->{h}));
2536 $self->_emit ("open");
2537 } else {
2538 $CFClient::UI::ROOT->remove ($self->{other});
2539 $self->_emit ("close");
2540 }
2541
2542 $self->_emit (changed => $self->{state});
2543} 2690}
2544 2691
2545############################################################################# 2692#############################################################################
2546 2693
2547package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2560} 2707}
2561 2708
2562sub set_tooltip_from { 2709sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2564 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2565 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2724 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2726 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2738
2583sub size_allocate { 2739sub size_allocate {
2584 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2585 2741
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2587} 2761}
2588 2762
2589sub _draw { 2763sub _draw {
2590 my ($self) = @_; 2764 my ($self) = @_;
2591 2765
… …
2608 glVertex $w, $h; 2782 glVertex $w, $h;
2609 glVertex $w, 0; 2783 glVertex $w, 0;
2610 glEnd; 2784 glEnd;
2611 2785
2612 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2613 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2614} 2789}
2615 2790
2616############################################################################# 2791#############################################################################
2617 2792
… …
2623 2798
2624sub new { 2799sub new {
2625 my $class = shift; 2800 my $class = shift;
2626 2801
2627 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2628 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2629 @_, 2805 @_,
2630 ); 2806 );
2631 2807
2632 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2693} 2869}
2694 2870
2695############################################################################# 2871#############################################################################
2696 2872
2697package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2698 2874
2699our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2700 2876
2701sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2702 my ($item) = @_;
2703
2704 my $desc =
2705 $item->{nrof} < 2
2706 ? $item->{name}
2707 : "$item->{nrof} × $item->{name_pl}";
2708
2709 $item->{flags} & Crossfire::Protocol::F_OPEN
2710 and $desc .= " (open)";
2711 $item->{flags} & Crossfire::Protocol::F_APPLIED
2712 and $desc .= " (applied)";
2713 $item->{flags} & Crossfire::Protocol::F_UNPAID
2714 and $desc .= " (unpaid)";
2715 $item->{flags} & Crossfire::Protocol::F_MAGIC
2716 and $desc .= " (magic)";
2717 $item->{flags} & Crossfire::Protocol::F_CURSED
2718 and $desc .= " (cursed)";
2719 $item->{flags} & Crossfire::Protocol::F_DAMNED
2720 and $desc .= " (damned)";
2721 $item->{flags} & Crossfire::Protocol::F_LOCKED
2722 and $desc .= " *";
2723
2724 $desc
2725}
2726
2727sub new {
2728 my $class = shift;
2729
2730 my %args = @_;
2731
2732 my $item = delete $args{item};
2733
2734 my $desc = _item_to_desc ($item);
2735
2736 my $self = $class->SUPER::new (
2737 can_hover => 1,
2738 can_events => 1,
2739 tooltip => ((CFClient::UI::Label::escape $desc)
2740 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2741 connect_button_down => sub {
2742 my ($self, $ev, $x, $y) = @_;
2743
2744 # todo: maybe put examine on 1? but should just be a tooltip :(
2745 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2746 my $targ = $::CONN->{player}{tag};
2747
2748 if ($item->{container} == $::CONN->{player}{tag}) {
2749 $targ = $main::OPENCONT;
2750 }
2751
2752 $::CONN->send ("move $targ $item->{tag} 0");
2753 } elsif ($ev->{button} == 1) {
2754 $::CONN->send ("examine $item->{tag}");
2755 } elsif ($ev->{button} == 2) {
2756 $::CONN->send ("apply $item->{tag}");
2757 } elsif ($ev->{button} == 3) {
2758 my @menu_items = (
2759 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2760 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2761 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2762 (
2763 $item->{flags} & Crossfire::Protocol::F_LOCKED
2764 ? (
2765 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2766 )
2767 : (
2768 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2769 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2770 )
2771 ),
2772 );
2773
2774 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2775 }
2776
2777 1
2778 },
2779 %args
2780 );
2781
2782
2783 $self->add (new CFClient::UI::Face
2784 can_events => 0,
2785 face => $item->{face},
2786 anim => $item->{anim},
2787 animspeed => $item->{animspeed},
2788 );
2789
2790 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2791
2792 $self->{item} = $item;
2793
2794 $self->update_item;
2795
2796 $self
2797}
2798
2799sub update_item {
2800 my ($self) = @_;
2801
2802 my $desc = _item_to_desc ($self->{item});
2803
2804 $self->{name_lbl}->set_text ($desc);
2805}
2806
2807#############################################################################
2808
2809package CFClient::UI::Inventory;
2810
2811our @ISA = CFClient::UI::ScrolledWindow::;
2812
2813sub new {
2814 my $class = shift;
2815
2816 my $self = $class->SUPER::new (
2817 scrolled => (new CFClient::UI::Table),
2818 @_,
2819 );
2820
2821 $self
2822}
2823
2824sub set_items {
2825 my ($self, $items) = @_;
2826
2827 $self->{scrolled}->clear;
2828 return unless $items;
2829
2830 my @items = sort {
2831 ($a->{type} <=> $b->{type})
2832 or ($a->{name} cmp $b->{name})
2833 } @$items;
2834
2835 $self->{real_items} = \@items;
2836
2837 for my $item (@items) {
2838 $item->{item} = $item;
2839 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2840 $item->update_item ();
2841 }
2842
2843 my $i = 0;
2844 for (@items) {
2845 $self->{scrolled}->add (0, $i, $_);
2846 my $nrof = $_->{item}->{nrof} || 1;
2847 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2848 }
2849
2850# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2851}
2852
2853sub size_request {
2854 my ($self) = @_;
2855 ($self->{req_w}, $self->{req_h});
2856}
2857 2878
2858############################################################################# 2879#############################################################################
2859 2880
2860package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2861 2882
… …
2902 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2924 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2905 2926
2906 $self->show; 2927 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2929}
2909 2930
2910sub mouse_motion { 2931sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2912 2933
2913 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2916} 2939}
2917 2940
2918sub button_up { 2941sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2920 2943
… …
2922 undef $GRAB; 2945 undef $GRAB;
2923 $self->hide; 2946 $self->hide;
2924 2947
2925 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2954 1
2955}
2956
2957#############################################################################
2958
2959package CFClient::UI::Multiplexer;
2960
2961our @ISA = CFClient::UI::Container::;
2962
2963sub new {
2964 my $class = shift;
2965
2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
2927 } 3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
2928} 3063}
2929 3064
2930############################################################################# 3065#############################################################################
2931 3066
2932package CFClient::UI::Statusbox; 3067package CFClient::UI::Statusbox;
… …
2992sub add { 3127sub add {
2993 my ($self, $text, %arg) = @_; 3128 my ($self, $text, %arg) = @_;
2994 3129
2995 $text =~ s/^\s+//; 3130 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3131 $text =~ s/\s+$//;
3132
3133 return unless $text;
2997 3134
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3135 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 3136
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3137 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3138
… …
3035 $self->SUPER::reconfigure; 3172 $self->SUPER::reconfigure;
3036} 3173}
3037 3174
3038############################################################################# 3175#############################################################################
3039 3176
3040package CFClient::UI::Root; 3177package CFClient::UI::Inventory;
3041 3178
3042our @ISA = CFClient::UI::Container::; 3179our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3180
3046sub new { 3181sub new {
3047 my $class = shift; 3182 my $class = shift;
3048 3183
3049 $class->SUPER::new ( 3184 my $self = $class->SUPER::new (
3185 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3186 @_,
3187 );
3188
3189 $self
3190}
3191
3192sub set_items {
3193 my ($self, $items) = @_;
3194
3195 $self->{child}->clear;
3196 return unless $items;
3197
3198 my @items = sort {
3199 ($a->{type} <=> $b->{type})
3200 or ($a->{name} cmp $b->{name})
3201 } @$items;
3202
3203 $self->{real_items} = \@items;
3204
3205 my $row = 0;
3206 for my $item (@items) {
3207 CFClient::Item::update_widgets $item;
3208
3209 $self->{child}->add (0, $row, $item->{face_widget});
3210 $self->{child}->add (1, $row, $item->{desc_widget});
3211 $self->{child}->add (2, $row, $item->{weight_widget});
3212
3213 $row++;
3214 }
3215}
3216
3217#############################################################################
3218
3219package CFClient::UI::BindEditor;
3220
3221our @ISA = CFClient::UI::FancyFrame::;
3222
3223sub new {
3224 my $class = shift;
3225
3226 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3227
3228 $self->add (my $vb = new CFClient::UI::VBox);
3229
3230
3231 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3232 text => "start recording",
3233 tooltip => "Start/Stops recording of actions."
3234 ."All subsequent actions after the recording started will be captured."
3235 ."The actions are displayed after the record was stopped."
3236 ."To bind the action you have to click on the 'Bind' button",
3237 on_activate => sub {
3238 unless ($self->{recording}) {
3239 $self->start;
3240 } else {
3241 $self->stop;
3242 }
3243 });
3244
3245 $vb->add (new CFClient::UI::Label text => "Actions:");
3246 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3247
3248 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3251 $hb->add (new CFClient::UI::Button
3252 text => "bind",
3253 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3254 on_activate => sub {
3255 $self->ask_for_bind;
3256 });
3257
3258 $vb->add (my $hb = new CFClient::UI::HBox);
3259 $hb->add (new CFClient::UI::Button
3260 text => "ok",
3261 expand => 1,
3262 tooltip => "This closes the binding editor and saves the binding",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->commit;
3266 });
3267
3268 $hb->add (new CFClient::UI::Button
3269 text => "cancel",
3270 expand => 1,
3271 tooltip => "This closes the binding editor without saving",
3272 on_activate => sub {
3273 $self->hide;
3274 $self->{binding_cancel}->()
3275 if $self->{binding_cancel};
3276 });
3277
3278 $self->update_binding_widgets;
3279
3280 $self
3281}
3282
3283sub commit {
3284 my ($self) = @_;
3285 my ($mod, $sym, $cmds) = $self->get_binding;
3286 if ($sym != 0 && @$cmds > 0) {
3287 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3288 ."'. Don't forget 'Save Config'!");
3289 $self->{binding_change}->($mod, $sym, $cmds)
3290 if $self->{binding_change};
3291 } else {
3292 $::STATUSBOX->add ("No action bound, no key or action specified!");
3293 $self->{binding_cancel}->()
3294 if $self->{binding_cancel};
3295 }
3296}
3297
3298sub start {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("stop recording");
3302 $self->{recording} = 1;
3303 $self->clear_command_list;
3304 $::CONN->start_record if $::CONN;
3305}
3306
3307sub stop {
3308 my ($self) = @_;
3309
3310 $self->{rec_btn}->set_text ("start recording");
3311 $self->{recording} = 0;
3312
3313 my $rec;
3314 $rec = $::CONN->stop_record if $::CONN;
3315 return unless ref $rec eq 'ARRAY';
3316 $self->set_command_list ($rec);
3317}
3318
3319
3320sub ask_for_bind_and_commit {
3321 my ($self) = @_;
3322 $self->ask_for_bind (1);
3323}
3324
3325sub ask_for_bind {
3326 my ($self, $commit) = @_;
3327
3328 CFClient::Binder::open_binding_dialog (sub {
3329 my ($mod, $sym) = @_;
3330 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3331 $self->update_binding_widgets;
3332 $self->commit if $commit;
3333 });
3334}
3335
3336# $mod and $sym are the modifiers and key symbol
3337# $cmds is a array ref of strings (the commands)
3338# $cb is the callback that is executed on OK
3339# $ccb is the callback that is executed on CANCEL and
3340# when the binding was unsuccessful on OK
3341sub set_binding {
3342 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3343
3344 $self->clear_command_list;
3345 $self->{recording} = 0;
3346 $self->{rec_btn}->set_text ("start recording");
3347
3348 $self->{binding} = [$mod, $sym];
3349 $self->{commands} = $cmds;
3350
3351 $self->{binding_change} = $cb;
3352 $self->{binding_cancel} = $ccb;
3353
3354 $self->update_binding_widgets;
3355}
3356
3357# this is a shortcut method that asks for a binding
3358# and then just binds it.
3359sub do_quick_binding {
3360 my ($self, $cmds) = @_;
3361 $self->set_binding (undef, undef, $cmds, sub {
3362 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3363 });
3364 $self->ask_for_bind (1);
3365}
3366
3367sub update_binding_widgets {
3368 my ($self) = @_;
3369 my ($mod, $sym, $cmds) = $self->get_binding;
3370 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3371 $self->set_command_list ($cmds);
3372}
3373
3374sub get_binding {
3375 my ($self) = @_;
3376 return (
3377 $self->{binding}->[0],
3378 $self->{binding}->[1],
3379 [ grep { defined $_ } @{$self->{commands}} ]
3380 );
3381}
3382
3383sub clear_command_list {
3384 my ($self) = @_;
3385 $self->{cmdbox}->clear ();
3386}
3387
3388sub set_command_list {
3389 my ($self, $cmds) = @_;
3390
3391 $self->{cmdbox}->clear ();
3392 $self->{commands} = $cmds;
3393
3394 my $idx = 0;
3395
3396 for (@$cmds) {
3397 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3398
3399 my $i = $idx;
3400 $hb->add (new CFClient::UI::Label text => $_);
3401 $hb->add (new CFClient::UI::Button
3402 text => "delete",
3403 tooltip => "Deletes the action from the record",
3404 on_activate => sub {
3405 $self->{cmdbox}->remove ($hb);
3406 $cmds->[$i] = undef;
3407 });
3408
3409
3410 $idx++
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::SpellList;
3417
3418our @ISA = CFClient::UI::Table::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (
3424 binding => [],
3425 commands => [],
3050 @_, 3426 @_,
3051 ) 3427 )
3052} 3428}
3053 3429
3054sub configure { 3430# XXX: Do sorting? Argl...
3055 my ($self, $x, $y, $w, $h) = @_; 3431sub add_spell {
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
3061sub check_size {
3062 my ($self) = @_; 3432 my ($self, $spell) = @_;
3433 $self->{spells}->{$spell->{name}} = $spell;
3063 3434
3064 $self->size_allocate ($self->{w}, $self->{h}) 3435 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3065 if $self->{w}; 3436 face => $spell->{face},
3437 can_hover => 1,
3438 can_events => 1,
3439 tooltip => $spell->{message});
3440
3441 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3442 text => $spell->{name},
3443 can_hover => 1,
3444 can_events => 1,
3445 tooltip => $spell->{message},
3446 expand => 1);
3447
3448 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3450 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3451 expand => 1);
3452
3453 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3454 text => "bind to key",
3455 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3456}
3457
3458sub rebuild_spell_list {
3459 my ($self) = @_;
3460 $self->{tbl_idx} = 0;
3461 $self->add_spell ($_) for values %{$self->{spells}};
3462}
3463
3464sub remove_spell {
3465 my ($self, $spell) = @_;
3466 delete $self->{spells}->{$spell->{name}};
3467 $self->rebuild_spell_list;
3468}
3469
3470#############################################################################
3471
3472package CFClient::UI::Root;
3473
3474our @ISA = CFClient::UI::Container::;
3475
3476use CFClient::OpenGL;
3477
3478sub new {
3479 my $class = shift;
3480
3481 my $self = $class->SUPER::new (
3482 visible => 1,
3483 @_,
3484 );
3485
3486 Scalar::Util::weaken ($self->{root} = $self);
3487
3488 $self
3066} 3489}
3067 3490
3068sub size_request { 3491sub size_request {
3069 my ($self) = @_; 3492 my ($self) = @_;
3070 3493
3071 ($self->{w}, $self->{h}) 3494 ($self->{w}, $self->{h})
3495}
3496
3497sub _to_pixel {
3498 my ($coord, $size, $max) = @_;
3499
3500 $coord =
3501 $coord eq "center" ? ($max - $size) * 0.5
3502 : $coord eq "max" ? $max
3503 : $coord;
3504
3505 $coord = 0 if $coord < 0;
3506 $coord = $max - $size if $coord > $max - $size;
3507
3508 int $coord + 0.5
3072} 3509}
3073 3510
3074sub size_allocate { 3511sub size_allocate {
3075 my ($self, $w, $h) = @_; 3512 my ($self, $w, $h) = @_;
3076 3513
3077 for my $child ($self->children) { 3514 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3515 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3516
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3517 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3518 $Y = $child->{force_y} if exists $child->{force_y};
3082 3519
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3520 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3521 $Y = _to_pixel $Y, $H, $self->{h};
3085
3086 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3087 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3088 3522
3089 $child->configure ($X, $Y, $W, $H); 3523 $child->configure ($X, $Y, $W, $H);
3090 } 3524 }
3091} 3525}
3092 3526
… …
3103} 3537}
3104 3538
3105sub update { 3539sub update {
3106 my ($self) = @_; 3540 my ($self) = @_;
3107 3541
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3542 $::WANT_REFRESH++;
3110} 3543}
3111 3544
3112sub add { 3545sub add {
3113 my ($self, @children) = @_; 3546 my ($self, @children) = @_;
3114 3547
3115 for (my @widgets = @children; my $w = pop @widgets; ) {
3116 push @widgets, $w->children;
3117 $w->{root} = $self;
3118 $w->{visible} = 1;
3119 }
3120
3121 for my $child (@children) {
3122 $child->{is_toplevel} = 1; 3548 $_->{is_toplevel} = 1
3123 3549 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3550
3129 $self->SUPER::add (@children); 3551 $self->SUPER::add (@children);
3130} 3552}
3131 3553
3132sub remove { 3554sub remove {
3133 my ($self, @children) = @_; 3555 my ($self, @children) = @_;
3134 3556
3135 $self->SUPER::remove (@children); 3557 $self->SUPER::remove (@children);
3558
3559 delete $self->{is_toplevel}
3560 for @children;
3136 3561
3137 while (@children) { 3562 while (@children) {
3138 my $w = pop @children; 3563 my $w = pop @children;
3139 push @children, $w->children; 3564 push @children, $w->children;
3140 $w->set_invisible; 3565 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3584 while ($self->{refresh_hook}) {
3160 $_->() 3585 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3586 for values %{delete $self->{refresh_hook}};
3162 } 3587 }
3163 3588
3164 if ($self->{check_size}) { 3589 if ($self->{realloc}) {
3165 my @queue = ([], []); 3590 my %queue;
3591 my @queue;
3592 my $widget;
3166 3593
3167 for (;;) { 3594 outer:
3168 if ($self->{check_size}) { 3595 while () {
3169 # heuristic: check containers last 3596 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3597 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3598 $widget->{visible} or next; # do not resize invisible widgets
3599
3600 $queue{$widget+0}++ and next; # duplicates are common
3601
3602 push @{ $queue[$widget->{visible}] }, $widget;
3603 }
3172 } 3604 }
3173 3605
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3606 while () {
3607 @queue or last outer;
3175 3608
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3609 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3610 and last;
3178 : $widget->size_request;
3179
3180 if (delete $widget->{force_alloc}
3181 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3182 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3183 3611
3612 pop @queue;
3613 }
3614
3615 delete $queue{$widget+0};
3616
3617 my ($w, $h) = $widget->size_request;
3618
3619 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3620 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3621
3622 $w = $widget->{force_w} if exists $widget->{force_w};
3623 $h = $widget->{force_h} if exists $widget->{force_h};
3624
3625 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3626 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3627 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3628 $widget->{req_h} = $h;
3186 3629
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3630 $self->{size_alloc}{$widget+0} = $widget;
3188 3631
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3632 if (my $parent = $widget->{parent}) {
3633 $self->{realloc}{$parent+0} = $parent
3634 unless $queue{$parent+0};
3635
3636 $parent->{force_size_alloc} = 1;
3637 $self->{size_alloc}{$parent+0} = $parent;
3638 }
3191 } 3639 }
3640
3641 delete $self->{realloc}{$widget+0};
3192 } 3642 }
3193 } 3643 }
3194 3644
3195 while ($self->{size_alloc}) { 3645 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3646 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3647 values %$size_alloc;
3648
3649 while () {
3650 my $widget = pop @queue || last;
3651
3652 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3653
3199 $w = 0 if $w < 0; 3654 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3655 $h = 0 if $h < 0;
3201 3656
3657 $w = int $w + 0.5;
3658 $h = int $h + 0.5;
3659
3660 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3661 $widget->{old_w} = $widget->{w};
3662 $widget->{old_h} = $widget->{h};
3663
3202 $widget->{w} = $w; 3664 $widget->{w} = $w;
3203 $widget->{h} = $h; 3665 $widget->{h} = $h;
3666
3204 $widget->emit (size_allocate => $w, $h); 3667 $widget->emit (size_allocate => $w, $h);
3668 }
3205 } 3669 }
3206 } 3670 }
3207 3671
3208 while ($self->{post_alloc_hook}) { 3672 while ($self->{post_alloc_hook}) {
3209 $_->() 3673 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3674 for values %{delete $self->{post_alloc_hook}};
3211 } 3675 }
3676
3212 3677
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3678 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3679 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3680 glClear GL_COLOR_BUFFER_BIT;
3216 3681
… …
3218 glLoadIdentity; 3683 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3684 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3685 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3686 glLoadIdentity;
3222 3687
3688 {
3689 package CFClient::UI::Base;
3690
3691 ($draw_x, $draw_y, $draw_w, $draw_h) =
3692 (0, 0, $self->{w}, $self->{h});
3693 }
3694
3223 $self->_draw; 3695 $self->_draw;
3224} 3696}
3225 3697
3226############################################################################# 3698#############################################################################
3227 3699

Diff Legend

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