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.277 by root, Sun Jun 4 00:21:52 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})
… …
699 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
700} 795}
701 796
702############################################################################# 797#############################################################################
703 798
799# back-buffered drawing area
800
704package CFClient::UI::Window; 801package CFClient::UI::Window;
705 802
706our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
707 804
708use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
726 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
727 $self->update; 824 $self->update;
728} 825}
729 826
730sub _render { 827sub _render {
828 my ($self) = @_;
829
731 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
732} 831}
733 832
734sub render_child { 833sub render_child {
735 my ($self) = @_; 834 my ($self) = @_;
736 835
737 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
738 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
739 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
740 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
741 $self->_render; 847 $self->_render;
742 }; 848 };
743} 849}
744 850
745sub _draw { 851sub _draw {
746 my ($self) = @_; 852 my ($self) = @_;
747 853
748 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
749 855
750 my $tex = $self->{texture} 856 my $tex = $self->{texture}
751 or return; 857 or return;
752 858
753 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
… …
763 869
764package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
765 871
766our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
767 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
768sub size_request { 884sub size_request {
769 my ($self) = @_; 885 my ($self) = @_;
770 886
771 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
772 888
773 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
774} 893}
775 894
776sub size_allocate { 895sub size_allocate {
777 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
778 897
779 my ($cw, $ch) = @$self{qw(child_w child_h)}; 898 my $child = $self->child;
780# $w = $self->{w}; 899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
781 $self->child->configure (0, 0, $cw, $ch); 903 $self->child->configure (0, 0, $w, $h);
782 $self->update; 904 $self->update;
783} 905}
784 906
785sub set_offset { 907sub set_offset {
786 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
820} 942}
821 943
822sub _render { 944sub _render {
823 my ($self) = @_; 945 my ($self) = @_;
824 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
825 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
826 951
827 $self->SUPER::_render; 952 $self->SUPER::_render;
828} 953}
829 954
… …
832package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
833 958
834our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
835 960
836sub new { 961sub new {
837 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
838 965
839 my $self; 966 my $self;
840 967
841 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
842 vertical => 1, 969 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 971 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 972 $self->{vp}->set_offset (0, $_[1]);
846 }, 973 },
847 ; 974 ;
848 975
849 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
850 vp => (new CFClient::UI::ViewPort expand => 1), 977 vp => (new CFClient::UI::ViewPort expand => 1),
851 slider => $slider, 978 slider => $slider,
852 @_, 979 %arg,
853 ); 980 );
854 981
855 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
858 984
859 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 1002}
861 1003
862sub size_allocate { 1004sub size_allocate {
863 my ($self, $w, $h) = @_; 1005 my ($self, $w, $h) = @_;
864 1006
… …
917 1059
918our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
919 1061
920use CFClient::OpenGL; 1062use CFClient::OpenGL;
921 1063
922my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 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); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1071
926sub new { 1072sub new {
927 my $class = shift; 1073 my ($class, %arg) = @_;
928 1074
929 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
930 1076
931 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1080 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1081 can_events => 1,
937 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
938 ); 1085 );
939 1086
940 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
941 align => 0, 1088 align => 0,
942 valign => 1, 1089 valign => 1,
943 text => $self->{title}, 1090 text => $title,
944 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
945 1093
946 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
947} 1102}
948 1103
949sub border { 1104sub border {
950 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
951} 1106}
952 1107
953sub size_request { 1108sub size_request {
954 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
955 1113
956 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
957 1115
958 ( 1116 (
959 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
962} 1120}
963 1121
964sub size_allocate { 1122sub size_allocate {
965 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
966 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
967 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
969 1135
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); 1136 $self->child->configure ($border, $border, $w, $h);
974} 1137}
975 1138
976sub button_down { 1139sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
978 1141
… …
994 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
995 1158
996 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
998 1161
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size; 1166 $self->realloc;
1003 }; 1167 };
1004 1168
1005 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1173 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1011 1175
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1177
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1016 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
1017 } 1186 1
1018} 1187}
1019 1188
1020sub button_up { 1189sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
1022 1191
1023 delete $self->{motion}; 1192 !!delete $self->{motion}
1024} 1193}
1025 1194
1026sub mouse_motion { 1195sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1028 1197
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
1030} 1201}
1031 1202
1032sub _draw { 1203sub _draw {
1033 my ($self) = @_; 1204 my ($self) = @_;
1034 1205
1206 my $child = $self->{children}[0];
1207
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1210
1038 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1213
1041 my $border = $self->border; 1214 my $border = $self->border;
1042 1215
1043 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1221
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
1051 1224
1052 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1228 $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); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1230 }
1063 1231
1064 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
1065 1233
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1069} 1240}
1070 1241
1071############################################################################# 1242#############################################################################
1072 1243
1073package CFClient::UI::Table; 1244package CFClient::UI::Table;
… …
1081sub new { 1252sub new {
1082 my $class = shift; 1253 my $class = shift;
1083 1254
1084 $class->SUPER::new ( 1255 $class->SUPER::new (
1085 col_expand => [], 1256 col_expand => [],
1086 @_ 1257 @_,
1087 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1263}
1089 1264
1090sub add { 1265sub add {
1091 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1092 1267
1093 $child->set_parent ($self); 1268 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1095 1270
1096 $child->check_size; 1271 $self->realloc;
1097} 1272}
1098 1273
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1275sub clear {
1105 my ($self) = @_; 1276 my ($self) = @_;
1106 1277
1107 my @children = $self->children; 1278 my @children = $self->children;
1108 delete $self->{children}; 1279 delete $self->{children};
… …
1110 for (@children) { 1281 for (@children) {
1111 delete $_->{parent}; 1282 delete $_->{parent};
1112 $_->hide; 1283 $_->hide;
1113 } 1284 }
1114 1285
1115 $self->update; 1286 $self->realloc;
1116} 1287}
1117 1288
1118sub get_wh { 1289sub get_wh {
1119 my ($self) = @_; 1290 my ($self) = @_;
1120 1291
… …
1151sub size_allocate { 1322sub size_allocate {
1152 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1153 1324
1154 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1155 1326
1156 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1158 1329
1159 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1387 }
1217} 1388}
1218 1389
1219############################################################################# 1390#############################################################################
1220 1391
1221package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1393
1225our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1226 1395
1227sub size_request { 1396sub size_request {
1228 my ($self) = @_; 1397 my ($self) = @_;
1229 1398
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1231 1400 ? (
1232 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1403 )
1235 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1236} 1408}
1237 1409
1238sub size_allocate { 1410sub size_allocate {
1239 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1240 1412
1241 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1414 my $children = $self->{children};
1244 1415
1245 my @h = map $_->{req_w}, @$children; 1416 my @req;
1246 1417
1247 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1248 1419 @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 { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1433 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 } 1434 }
1263 } 1435 }
1264 1436
1265 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1266 1438
1267 my $y = 0; 1439 my $pos = 0;
1268 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1443
1273 $y += $h; 1444 $pos += $alloc;
1274 } 1445 }
1275 1446
1276 1 1447 1
1277} 1448}
1278 1449
1279############################################################################# 1450#############################################################################
1280 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1281package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1282 1468
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1286 1470
1287sub size_request { 1471sub new {
1288 my ($self) = @_; 1472 my $class = shift;
1289 1473
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1291 1475 vertical => 1,
1292 ( 1476 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1477 )
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} 1478}
1336 1479
1337############################################################################# 1480#############################################################################
1338 1481
1339package CFClient::UI::Label; 1482package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1499 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1358 fontsize => 1, 1501 fontsize => 1,
1359 align => -1, 1502 align => -1,
1360 valign => -1, 1503 valign => -1,
1361 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1362 can_events => 0, 1506 can_events => 0,
1363 %arg 1507 %arg
1364 ); 1508 );
1365 1509
1366 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1403 1547
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1406 1550
1551 $self->realloc;
1407 $self->update; 1552 $self->update;
1408 $self->check_size;
1409} 1553}
1410 1554
1411sub set_markup { 1555sub set_markup {
1412 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1413 1557
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1562
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1421 1565
1566 $self->realloc;
1422 $self->update; 1567 $self->update;
1423 $self->check_size;
1424} 1568}
1425 1569
1426sub size_request { 1570sub size_request {
1427 my ($self) = @_; 1571 my ($self) = @_;
1428 1572
… …
1442 1586
1443 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1445 } 1589 }
1446 1590
1447 ( 1591 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1592}
1452 1593
1453sub size_allocate { 1594sub size_allocate {
1454 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1455 1596
1597 delete $self->{ox};
1598
1456 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1601}
1458 1602
1459sub set_fontsize { 1603sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1461 1605
1462 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1607 delete $self->{texture};
1464 1608
1465 $self->update; 1609 $self->realloc;
1466 $self->check_size;
1467} 1610}
1468 1611
1469sub _draw { 1612sub _draw {
1470 my ($self) = @_; 1613 my ($self) = @_;
1471 1614
… …
1477 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1624
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1483 1627
1628 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1631 : ($self->{w} - $tex->{w}) * 0.5);
1487 1632
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1635 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1636 };
1494 1637
1495 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1640
… …
1535 1678
1536 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1537 1680
1538 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1539 1682
1540 delete $self->{texture};
1541
1542 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1543 $self->{text} = $text; 1684 $self->{text} = $text;
1544 1685
1545 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1546 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1547 1688
1548 $self->_emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1549} 1691}
1550 1692
1551sub set_text { 1693sub set_text {
1552 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1553 1695
1554 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1697 $self->_set_text ($text);
1556 $self->update; 1698
1557 $self->check_size; 1699 $self->realloc;
1558} 1700}
1559 1701
1560sub get_text { 1702sub get_text {
1561 $_[0]{text} 1703 $_[0]{text}
1562} 1704}
… …
1592 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1736 $self->_emit ('escape');
1595 } elsif ($uni) { 1737 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1597 } 1741 }
1598 1742
1599 $self->_set_text ($text); 1743 $self->_set_text ($text);
1600 $self->update; 1744
1601 $self->check_size; 1745 $self->realloc;
1746
1747 1
1602} 1748}
1603 1749
1604sub focus_in { 1750sub focus_in {
1605 my ($self) = @_; 1751 my ($self) = @_;
1606 1752
… …
1621 utf8::encode $text; 1767 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1623 1769
1624 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1625 $self->update; 1771 $self->update;
1772
1773 1
1626} 1774}
1627 1775
1628sub mouse_motion { 1776sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1631} 1781}
1632 1782
1633sub _draw { 1783sub _draw {
1634 my ($self) = @_; 1784 my ($self) = @_;
1635 1785
… …
1712 } else { 1862 } else {
1713 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1714 } 1864 }
1715 1865
1716 } else { 1866 } else {
1717 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1718 } 1870 1
1719
1720} 1871}
1721 1872
1722############################################################################# 1873#############################################################################
1723 1874
1724package CFClient::UI::Button; 1875package CFClient::UI::Button;
… …
1733 1884
1734sub new { 1885sub new {
1735 my $class = shift; 1886 my $class = shift;
1736 1887
1737 $class->SUPER::new ( 1888 $class->SUPER::new (
1738 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1739 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1741 can_hover => 1, 1893 can_hover => 1,
1742 align => 0, 1894 align => 0,
1743 valign => 0, 1895 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1753 1905
1754 $self->emit ("activate") 1906 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1908 && $y >= 0 && $y < $self->{h};
1909
1910 1
1757} 1911}
1758 1912
1759sub _draw { 1913sub _draw {
1760 my ($self) = @_; 1914 my ($self) = @_;
1761 1915
… …
1790 1944
1791sub new { 1945sub new {
1792 my $class = shift; 1946 my $class = shift;
1793 1947
1794 $class->SUPER::new ( 1948 $class->SUPER::new (
1795 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1796 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1953 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1954 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1955 state => 0,
… …
1804} 1959}
1805 1960
1806sub size_request { 1961sub size_request {
1807 my ($self) = @_; 1962 my ($self) = @_;
1808 1963
1809 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1810} 1965}
1811 1966
1812sub button_down { 1967sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1814 1969
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1819 } 1978 1
1820} 1979}
1821 1980
1822sub _draw { 1981sub _draw {
1823 my ($self) = @_; 1982 my ($self) = @_;
1824 1983
1825 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1826 1985
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1987
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1991
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1993
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1995
… …
2099 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2262 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2263 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2264 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2106 vertical => 0, 2267 vertical => 0,
2107 can_hover => 1, 2268 can_hover => 1,
2108 inner_pad => 0.02, 2269 inner_pad => 0.02,
2109 @_ 2270 @_
2110 ); 2271 );
… …
2113 $self->update; 2274 $self->update;
2114 2275
2115 $self 2276 $self
2116} 2277}
2117 2278
2279sub changed { }
2280
2118sub set_range { 2281sub set_range {
2119 my ($self, $range) = @_; 2282 my ($self, $range) = @_;
2120 2283
2121 $self->{range} = $range; 2284 ($range, $self->{range}) = ($self->{range}, $range);
2122 2285
2123 $self->update; 2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2124} 2288}
2125 2289
2126sub set_value { 2290sub set_value {
2127 my ($self, $value) = @_; 2291 my ($self, $value) = @_;
2128 2292
… …
2147} 2311}
2148 2312
2149sub size_request { 2313sub size_request {
2150 my ($self) = @_; 2314 my ($self) = @_;
2151 2315
2152 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2317}
2157 2318
2158sub button_down { 2319sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2160 2321
2161 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2162 2323
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2325
2165 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2166} 2327}
2167 2328
2168sub mouse_motion { 2329sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2170 2331
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2336
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2338
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2179 } 2344 1
2180} 2345}
2181 2346
2182sub update { 2347sub update {
2183 my ($self) = @_; 2348 my ($self) = @_;
2184 2349
2185 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2186 $self->set_value ($self->{range}[0]); 2358 $self->set_value ($self->{range}[0]);
2187 2359
2188 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2189 my $range = ($hi - $page - $lo) || 1e-100; 2361 my $range = ($hi - $page - $lo) || 1e-100;
2190 2362
… …
2196 $value = ($value - $lo) / $range; 2368 $value = ($value - $lo) / $range;
2197 $value = $value * $self->{scale} + $self->{offset}; 2369 $value = $value * $self->{scale} + $self->{offset};
2198 2370
2199 $self->{knob_x} = $value - $knob_w * 0.5; 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2200 $self->{knob_w} = $knob_w; 2372 $self->{knob_w} = $knob_w;
2201 }); 2373 }
2202
2203 $self->SUPER::update;
2204}
2205
2206sub _draw {
2207 my ($self) = @_;
2208 2374
2209 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2210 2376
2211 glScale $self->{w}, $self->{h}; 2377 glScale $self->{w}, $self->{h};
2212 2378
… …
2511 2677
2512sub new { 2678sub new {
2513 my $class = shift; 2679 my $class = shift;
2514 2680
2515 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2516 state => 0, 2682 state => 0,
2517 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2518 @_ 2684 @_
2519 ); 2685 );
2520 2686
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2687 $self
2527} 2688}
2528 2689
2529sub toggle_flopper { 2690sub toggle_flopper {
2530 my ($self) = @_; 2691 my ($self) = @_;
2531 2692
2532 # TODO: use animation 2693 $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} 2694}
2544 2695
2545############################################################################# 2696#############################################################################
2546 2697
2547package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
… …
2560} 2711}
2561 2712
2562sub set_tooltip_from { 2713sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2564 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2565 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2728 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2730 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2742
2583sub size_allocate { 2743sub size_allocate {
2584 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2585 2745
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2587} 2765}
2588 2766
2589sub _draw { 2767sub _draw {
2590 my ($self) = @_; 2768 my ($self) = @_;
2591 2769
… …
2608 glVertex $w, $h; 2786 glVertex $w, $h;
2609 glVertex $w, 0; 2787 glVertex $w, 0;
2610 glEnd; 2788 glEnd;
2611 2789
2612 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2613 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2614} 2793}
2615 2794
2616############################################################################# 2795#############################################################################
2617 2796
… …
2623 2802
2624sub new { 2803sub new {
2625 my $class = shift; 2804 my $class = shift;
2626 2805
2627 my $self = $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2628 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2629 @_, 2809 @_,
2630 ); 2810 );
2631 2811
2632 if ($self->{anim} && $self->{animspeed}) { 2812 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2813 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2872 $self->SUPER::DESTROY;
2693} 2873}
2694 2874
2695############################################################################# 2875#############################################################################
2696 2876
2697package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2698 2878
2699our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2700 2880
2701sub _item_to_desc { 2881# 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 2882
2858############################################################################# 2883#############################################################################
2859 2884
2860package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2861 2886
… …
2902 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2928 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2905 2930
2906 $self->show; 2931 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2933}
2909 2934
2910sub mouse_motion { 2935sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2912 2937
2913 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2916} 2943}
2917 2944
2918sub button_up { 2945sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2920 2947
… …
2922 undef $GRAB; 2949 undef $GRAB;
2923 $self->hide; 2950 $self->hide;
2924 2951
2925 $self->_emit ("popdown"); 2952 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2958 1
2959}
2960
2961#############################################################################
2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
2927 } 3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
2928} 3067}
2929 3068
2930############################################################################# 3069#############################################################################
2931 3070
2932package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
… …
2992sub add { 3131sub add {
2993 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2994 3133
2995 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2997 3138
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 3140
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3142
… …
3035 $self->SUPER::reconfigure; 3176 $self->SUPER::reconfigure;
3036} 3177}
3037 3178
3038############################################################################# 3179#############################################################################
3039 3180
3040package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
3041 3182
3042our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3184
3046sub new { 3185sub new {
3047 my $class = shift; 3186 my $class = shift;
3048 3187
3049 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
3050 @_, 3430 @_,
3051 ) 3431 )
3052} 3432}
3053 3433
3054sub configure { 3434# XXX: Do sorting? Argl...
3055 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
3061sub check_size {
3062 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
3063 3438
3064 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3065 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
3066} 3493}
3067 3494
3068sub size_request { 3495sub size_request {
3069 my ($self) = @_; 3496 my ($self) = @_;
3070 3497
3071 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
3072} 3513}
3073 3514
3074sub size_allocate { 3515sub size_allocate {
3075 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
3076 3517
3077 for my $child ($self->children) { 3518 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3520
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3521 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3082 3523
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3524 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3525 $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 3526
3089 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
3090 } 3528 }
3091} 3529}
3092 3530
… …
3103} 3541}
3104 3542
3105sub update { 3543sub update {
3106 my ($self) = @_; 3544 my ($self) = @_;
3107 3545
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
3110} 3547}
3111 3548
3112sub add { 3549sub add {
3113 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
3114 3551
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; 3552 $_->{is_toplevel} = 1
3123 3553 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3554
3129 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3130} 3556}
3131 3557
3132sub remove { 3558sub remove {
3133 my ($self, @children) = @_; 3559 my ($self, @children) = @_;
3134 3560
3135 $self->SUPER::remove (@children); 3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3136 3565
3137 while (@children) { 3566 while (@children) {
3138 my $w = pop @children; 3567 my $w = pop @children;
3139 push @children, $w->children; 3568 push @children, $w->children;
3140 $w->set_invisible; 3569 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
3160 $_->() 3589 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
3162 } 3591 }
3163 3592
3164 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
3165 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
3166 3597
3167 for (;;) { 3598 outer:
3168 if ($self->{check_size}) { 3599 while () {
3169 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
3172 } 3608 }
3173 3609
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
3175 3612
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3614 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 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
3186 3633
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
3188 3635
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
3191 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
3192 } 3646 }
3193 } 3647 }
3194 3648
3195 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3657
3199 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
3201 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
3202 $widget->{w} = $w; 3668 $widget->{w} = $w;
3203 $widget->{h} = $h; 3669 $widget->{h} = $h;
3670
3204 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
3205 } 3673 }
3206 } 3674 }
3207 3675
3208 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
3209 $_->() 3677 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
3211 } 3679 }
3680
3212 3681
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
3216 3685
… …
3218 glLoadIdentity; 3687 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3690 glLoadIdentity;
3222 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
3223 $self->_draw; 3699 $self->_draw;
3224} 3700}
3225 3701
3226############################################################################# 3702#############################################################################
3227 3703

Diff Legend

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