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.272 by root, Sat Jun 3 01:47:14 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
… …
837 my $class = shift; 960 my $class = shift;
838 961
839 my $self; 962 my $self;
840 963
841 my $slider = new CFClient::UI::Slider 964 my $slider = new CFClient::UI::Slider
842 vertical => 1, 965 vertical => 1,
843 range => [0, 0, 1, 0.01], # HACK fix 966 range => [0, 0, 1, 0.01], # HACK fix
844 connect_changed => sub { 967 on_changed => sub {
845 $self->{vp}->set_offset (0, $_[1]); 968 $self->{vp}->set_offset (0, $_[1]);
846 }, 969 },
847 ; 970 ;
848 971
849 $self = $class->SUPER::new ( 972 $self = $class->SUPER::new (
… …
855 $self->{vp}->add ($self->{scrolled}); 978 $self->{vp}->add ($self->{scrolled});
856 $self->add ($self->{vp}); 979 $self->add ($self->{vp});
857 $self->add ($self->{slider}); 980 $self->add ($self->{slider});
858 981
859 $self 982 $self
983}
984
985sub update {
986 my ($self) = @_;
987
988 $self->SUPER::update;
989
990 # todo: overwrite size_allocate of child
991 my $child = $self->{vp}->child;
992 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
860} 993}
861 994
862sub size_allocate { 995sub size_allocate {
863 my ($self, $w, $h) = @_; 996 my ($self, $w, $h) = @_;
864 997
… …
917 1050
918our @ISA = CFClient::UI::Bin::; 1051our @ISA = CFClient::UI::Bin::;
919 1052
920use CFClient::OpenGL; 1053use CFClient::OpenGL;
921 1054
922my @tex = 1055my $bg =
1056 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1057 mipmap => 1, wrap => 1;
1058
1059my @border =
923 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1060 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); 1061 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
925 1062
926sub new { 1063sub new {
927 my $class = shift; 1064 my ($class, %arg) = @_;
928 1065
929 # TODO: user_x, user_y, overwrite moveto? 1066 my $title = delete $arg{title};
930 1067
931 my $self = $class->SUPER::new ( 1068 my $self = $class->SUPER::new (
932 bg => [1, 1, 1, 1], 1069 bg => [1, 1, 1, 1],
933 border_bg => [1, 1, 1, 1], 1070 border_bg => [1, 1, 1, 1],
934 border => 0.6, 1071 border => 0.6,
935 is_toplevel => 1,
936 can_events => 1, 1072 can_events => 1,
937 @_ 1073 min_w => 16,
1074 min_h => 16,
1075 %arg,
938 ); 1076 );
939 1077
940 $self->{title} &&= new CFClient::UI::Label 1078 $self->{title} = new CFClient::UI::Label
941 align => 0, 1079 align => 0,
942 valign => 1, 1080 valign => 1,
943 text => $self->{title}, 1081 text => $title,
944 fontsize => $self->{border}; 1082 fontsize => $self->{border}
1083 if defined $title;
945 1084
946 $self 1085 $self
1086}
1087
1088sub add {
1089 my ($self, @widgets) = @_;
1090
1091 $self->SUPER::add (@widgets);
1092 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
947} 1093}
948 1094
949sub border { 1095sub border {
950 int $_[0]{border} * $::FONTSIZE 1096 int $_[0]{border} * $::FONTSIZE
951} 1097}
952 1098
953sub size_request { 1099sub size_request {
954 my ($self) = @_; 1100 my ($self) = @_;
1101
1102 $self->{title}->size_request
1103 if $self->{title};
955 1104
956 my ($w, $h) = $self->SUPER::size_request; 1105 my ($w, $h) = $self->SUPER::size_request;
957 1106
958 ( 1107 (
959 $w + $self->border * 2, 1108 $w + $self->border * 2,
… …
962} 1111}
963 1112
964sub size_allocate { 1113sub size_allocate {
965 my ($self, $w, $h) = @_; 1114 my ($self, $w, $h) = @_;
966 1115
1116 if ($self->{title}) {
1117 $self->{title}{w} = $w;
1118 $self->{title}{h} = $h;
1119 $self->{title}->size_allocate ($w, $h);
1120 }
1121
1122 my $border = $self->border;
1123
967 $h -= List::Util::max 0, $self->border * 2; 1124 $h -= List::Util::max 0, $border * 2;
968 $w -= List::Util::max 0, $self->border * 2; 1125 $w -= List::Util::max 0, $border * 2;
969 1126
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); 1127 $self->child->configure ($border, $border, $w, $h);
974} 1128}
975 1129
976sub button_down { 1130sub button_down {
977 my ($self, $ev, $x, $y) = @_; 1131 my ($self, $ev, $x, $y) = @_;
978 1132
… …
994 my ($ev, $x, $y) = @_; 1148 my ($ev, $x, $y) = @_;
995 1149
996 my $dx = $ev->{x} - $ox; 1150 my $dx = $ev->{x} - $ox;
997 my $dy = $ev->{y} - $oy; 1151 my $dy = $ev->{y} - $oy;
998 1152
999 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1153 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1000 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1154 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1155
1156 $self->realloc;
1001 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1157 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1002 $self->check_size;
1003 }; 1158 };
1004 1159
1005 } elsif ($lr ^ $td) { 1160 } elsif ($lr ^ $td) {
1006 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1161 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1007 my ($bx, $by) = ($self->{x}, $self->{y}); 1162 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1009 $self->{motion} = sub { 1164 $self->{motion} = sub {
1010 my ($ev, $x, $y) = @_; 1165 my ($ev, $x, $y) = @_;
1011 1166
1012 ($x, $y) = ($ev->{x}, $ev->{y}); 1167 ($x, $y) = ($ev->{x}, $ev->{y});
1013 1168
1014 $self->move ($bx + $x - $ox, $by + $y - $oy); 1169 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1015 $self->update;
1016 }; 1170 };
1171 } else {
1172 return 0;
1173 }
1174
1017 } 1175 1
1018} 1176}
1019 1177
1020sub button_up { 1178sub button_up {
1021 my ($self, $ev, $x, $y) = @_; 1179 my ($self, $ev, $x, $y) = @_;
1022 1180
1023 delete $self->{motion}; 1181 !!delete $self->{motion}
1024} 1182}
1025 1183
1026sub mouse_motion { 1184sub mouse_motion {
1027 my ($self, $ev, $x, $y) = @_; 1185 my ($self, $ev, $x, $y) = @_;
1028 1186
1029 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1187 $self->{motion}->($ev, $x, $y) if $self->{motion};
1188
1189 !!$self->{motion}
1030} 1190}
1031 1191
1032sub _draw { 1192sub _draw {
1033 my ($self) = @_; 1193 my ($self) = @_;
1034 1194
1195 my $child = $self->{children}[0];
1196
1035 my ($w, $h ) = ($self->{w}, $self->{h}); 1197 my ($w, $h ) = ($self->{w}, $self->{h});
1036 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1198 my ($cw, $ch) = ($child->{w}, $child->{h});
1037 1199
1038 glEnable GL_TEXTURE_2D; 1200 glEnable GL_TEXTURE_2D;
1039 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1201 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1040 1202
1041 my $border = $self->border; 1203 my $border = $self->border;
1042 1204
1043 glColor @{ $self->{border_bg} }; 1205 glColor @{ $self->{border_bg} };
1044 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1206 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1045 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1207 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1046 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1208 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1047 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1209 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1048 1210
1049 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1211 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1050 my $bg = $tex[0]; 1212 glColor @{ $self->{bg} };
1051 1213
1052 # TODO: repeat texture not scale 1214 # TODO: repeat texture not scale
1215 # solve this better(?)
1053 my $rep_x = $cw / $bg->{w}; 1216 $bg->{s} = $cw / $bg->{w};
1054 my $rep_y = $ch / $bg->{h}; 1217 $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); 1218 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1062 } 1219 }
1063 1220
1064 glDisable GL_TEXTURE_2D; 1221 glDisable GL_TEXTURE_2D;
1065 1222
1066 $self->{title}->draw if $self->{title};
1067
1068 $self->child->draw; 1223 $child->draw;
1224
1225 if ($self->{title}) {
1226 glTranslate 0, $border - $self->{h};
1227 $self->{title}->_draw;
1228 }
1069} 1229}
1070 1230
1071############################################################################# 1231#############################################################################
1072 1232
1073package CFClient::UI::Table; 1233package CFClient::UI::Table;
… …
1081sub new { 1241sub new {
1082 my $class = shift; 1242 my $class = shift;
1083 1243
1084 $class->SUPER::new ( 1244 $class->SUPER::new (
1085 col_expand => [], 1245 col_expand => [],
1086 @_ 1246 @_,
1087 ) 1247 )
1248}
1249
1250sub children {
1251 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1088} 1252}
1089 1253
1090sub add { 1254sub add {
1091 my ($self, $x, $y, $child) = @_; 1255 my ($self, $x, $y, $child) = @_;
1092 1256
1093 $child->set_parent ($self); 1257 $child->set_parent ($self);
1094 $self->{children}[$y][$x] = $child; 1258 $self->{children}[$y][$x] = $child;
1095 1259
1096 $child->check_size; 1260 $self->realloc;
1097} 1261}
1098 1262
1099sub children {
1100 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1101}
1102
1103# TODO: move to container class maybe? send childs a signal on removal? 1263# TODO: move to container class maybe? send children a signal on removal?
1104sub clear { 1264sub clear {
1105 my ($self) = @_; 1265 my ($self) = @_;
1106 1266
1107 my @children = $self->children; 1267 my @children = $self->children;
1108 delete $self->{children}; 1268 delete $self->{children};
… …
1110 for (@children) { 1270 for (@children) {
1111 delete $_->{parent}; 1271 delete $_->{parent};
1112 $_->hide; 1272 $_->hide;
1113 } 1273 }
1114 1274
1115 $self->update; 1275 $self->realloc;
1116} 1276}
1117 1277
1118sub get_wh { 1278sub get_wh {
1119 my ($self) = @_; 1279 my ($self) = @_;
1120 1280
… …
1151sub size_allocate { 1311sub size_allocate {
1152 my ($self, $w, $h) = @_; 1312 my ($self, $w, $h) = @_;
1153 1313
1154 my ($ws, $hs) = $self->get_wh; 1314 my ($ws, $hs) = $self->get_wh;
1155 1315
1156 my $req_w = sum @$ws; 1316 my $req_w = (sum @$ws) || 1;
1157 my $req_h = sum @$hs; 1317 my $req_h = (sum @$hs) || 1;
1158 1318
1159 # TODO: nicer code && do row_expand 1319 # TODO: nicer code && do row_expand
1160 my @col_expand = @{$self->{col_expand}}; 1320 my @col_expand = @{$self->{col_expand}};
1161 @col_expand = (1) x @$ws unless @col_expand; 1321 @col_expand = (1) x @$ws unless @col_expand;
1162 my $col_expand = (sum @col_expand) || 1; 1322 my $col_expand = (sum @col_expand) || 1;
… …
1216 } 1376 }
1217} 1377}
1218 1378
1219############################################################################# 1379#############################################################################
1220 1380
1221package CFClient::UI::HBox; 1381package CFClient::UI::Box;
1222
1223# TODO: wrap into common Box base class
1224 1382
1225our @ISA = CFClient::UI::Container::; 1383our @ISA = CFClient::UI::Container::;
1226 1384
1227sub size_request { 1385sub size_request {
1228 my ($self) = @_; 1386 my ($self) = @_;
1229 1387
1230 my @alloc = map [$_->size_request], @{$self->{children}}; 1388 $self->{vertical}
1231 1389 ? (
1232 ( 1390 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1233 (List::Util::sum map $_->[0], @alloc), 1391 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1234 (List::Util::max map $_->[1], @alloc), 1392 )
1235 ) 1393 : (
1394 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1395 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1396 )
1236} 1397}
1237 1398
1238sub size_allocate { 1399sub size_allocate {
1239 my ($self, $w, $h) = @_; 1400 my ($self, $w, $h) = @_;
1240 1401
1241 ($h, $w) = ($w, $h); 1402 my $space = $self->{vertical} ? $h : $w;
1242
1243 my $children = $self->{children}; 1403 my $children = $self->{children};
1244 1404
1245 my @h = map $_->{req_w}, @$children; 1405 my @req;
1246 1406
1247 my $req_h = List::Util::sum @h; 1407 if ($self->{homogeneous}) {
1248 1408 @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 { 1409 } else {
1410 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1411 my $req = List::Util::sum @req;
1412
1413 if ($req > $space) {
1414 # ah well, not enough space
1415 $_ *= $space / $req for @req;
1416 } else {
1253 my $exp = List::Util::sum map $_->{expand}, @$children; 1417 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1254 $exp ||= 1;
1255 1418
1419 $space = ($space - $req) / $expand; # remaining space to give away
1420
1421 $req[$_] += $space * $children->[$_]{expand}
1256 for (0 .. $#$children) { 1422 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 } 1423 }
1263 } 1424 }
1264 1425
1265 CFClient::UI::harmonize \@h; 1426 CFClient::UI::harmonize \@req;
1266 1427
1267 my $y = 0; 1428 my $pos = 0;
1268 for (0 .. $#$children) { 1429 for (0 .. $#$children) {
1269 my $child = $children->[$_];
1270 my $h = $h[$_]; 1430 my $alloc = $req[$_];
1271 $child->configure ($y, 0, $h, $w); 1431 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1272 1432
1273 $y += $h; 1433 $pos += $alloc;
1274 } 1434 }
1275 1435
1276 1 1436 1
1277} 1437}
1278 1438
1279############################################################################# 1439#############################################################################
1280 1440
1441package CFClient::UI::HBox;
1442
1443our @ISA = CFClient::UI::Box::;
1444
1445sub new {
1446 my $class = shift;
1447
1448 $class->SUPER::new (
1449 vertical => 0,
1450 @_,
1451 )
1452}
1453
1454#############################################################################
1455
1281package CFClient::UI::VBox; 1456package CFClient::UI::VBox;
1282 1457
1283# TODO: wrap into common Box base class
1284
1285our @ISA = CFClient::UI::Container::; 1458our @ISA = CFClient::UI::Box::;
1286 1459
1287sub size_request { 1460sub new {
1288 my ($self) = @_; 1461 my $class = shift;
1289 1462
1290 my @alloc = map [$_->size_request], @{$self->{children}}; 1463 $class->SUPER::new (
1291 1464 vertical => 1,
1292 ( 1465 @_,
1293 (List::Util::max map $_->[0], @alloc),
1294 (List::Util::sum map $_->[1], @alloc),
1295 ) 1466 )
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} 1467}
1336 1468
1337############################################################################# 1469#############################################################################
1338 1470
1339package CFClient::UI::Label; 1471package CFClient::UI::Label;
… …
1356 ellipsise => 3, # end 1488 ellipsise => 3, # end
1357 layout => (new CFClient::Layout), 1489 layout => (new CFClient::Layout),
1358 fontsize => 1, 1490 fontsize => 1,
1359 align => -1, 1491 align => -1,
1360 valign => -1, 1492 valign => -1,
1361 padding => 2, 1493 padding_x => 2,
1494 padding_y => 2,
1362 can_events => 0, 1495 can_events => 0,
1363 %arg 1496 %arg
1364 ); 1497 );
1365 1498
1366 if (exists $self->{template}) { 1499 if (exists $self->{template}) {
… …
1402 $self->{text} = "T$text"; 1535 $self->{text} = "T$text";
1403 1536
1404 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1537 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1405 $self->{layout}->set_text ($text); 1538 $self->{layout}->set_text ($text);
1406 1539
1540 $self->realloc;
1407 $self->update; 1541 $self->update;
1408 $self->check_size;
1409} 1542}
1410 1543
1411sub set_markup { 1544sub set_markup {
1412 my ($self, $markup) = @_; 1545 my ($self, $markup) = @_;
1413 1546
… …
1417 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1550 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1418 1551
1419 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1552 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1420 $self->{layout}->set_markup ($markup); 1553 $self->{layout}->set_markup ($markup);
1421 1554
1555 $self->realloc;
1422 $self->update; 1556 $self->update;
1423 $self->check_size;
1424} 1557}
1425 1558
1426sub size_request { 1559sub size_request {
1427 my ($self) = @_; 1560 my ($self) = @_;
1428 1561
… …
1442 1575
1443 $w = List::Util::max $w, $w2; 1576 $w = List::Util::max $w, $w2;
1444 $h = List::Util::max $h, $h2; 1577 $h = List::Util::max $h, $h2;
1445 } 1578 }
1446 1579
1447 ( 1580 ($w, $h)
1448 $w + $self->{padding} * 2,
1449 $h + $self->{padding} * 2,
1450 )
1451} 1581}
1452 1582
1453sub size_allocate { 1583sub size_allocate {
1454 my ($self, $w, $h) = @_; 1584 my ($self, $w, $h) = @_;
1455 1585
1586 delete $self->{ox};
1587
1456 delete $self->{texture}; 1588 delete $self->{texture}
1589 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1457} 1590}
1458 1591
1459sub set_fontsize { 1592sub set_fontsize {
1460 my ($self, $fontsize) = @_; 1593 my ($self, $fontsize) = @_;
1461 1594
1462 $self->{fontsize} = $fontsize; 1595 $self->{fontsize} = $fontsize;
1463 delete $self->{texture}; 1596 delete $self->{texture};
1464 1597
1465 $self->update; 1598 $self->realloc;
1466 $self->check_size;
1467} 1599}
1468 1600
1469sub _draw { 1601sub _draw {
1470 my ($self) = @_; 1602 my ($self) = @_;
1471 1603
… …
1477 $self->{layout}->set_width ($self->{w}); 1609 $self->{layout}->set_width ($self->{w});
1478 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1610 $self->{layout}->set_ellipsise ($self->{ellipsise});
1479 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1611 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1480 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1612 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1481 1613
1482 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1614 new_from_layout CFClient::Texture $self->{layout}
1615 };
1483 1616
1617 unless (exists $self->{ox}) {
1484 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1618 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1485 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1619 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1486 : ($self->{w} - $tex->{w}) * 0.5); 1620 : ($self->{w} - $tex->{w}) * 0.5);
1487 1621
1488 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1622 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1489 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1623 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1490 : ($self->{h} - $tex->{h}) * 0.5); 1624 : ($self->{h} - $tex->{h}) * 0.5);
1491
1492 $tex
1493 }; 1625 };
1494 1626
1495 glEnable GL_TEXTURE_2D; 1627 glEnable GL_TEXTURE_2D;
1496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1628 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1497 1629
… …
1551sub set_text { 1683sub set_text {
1552 my ($self, $text) = @_; 1684 my ($self, $text) = @_;
1553 1685
1554 $self->{cursor} = length $text; 1686 $self->{cursor} = length $text;
1555 $self->_set_text ($text); 1687 $self->_set_text ($text);
1556 $self->update; 1688
1557 $self->check_size; 1689 $self->realloc;
1558} 1690}
1559 1691
1560sub get_text { 1692sub get_text {
1561 $_[0]{text} 1693 $_[0]{text}
1562} 1694}
… …
1592 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1593 } elsif ($uni == 27) { 1725 } elsif ($uni == 27) {
1594 $self->_emit ('escape'); 1726 $self->_emit ('escape');
1595 } elsif ($uni) { 1727 } elsif ($uni) {
1596 substr $text, $self->{cursor}++, 0, chr $uni; 1728 substr $text, $self->{cursor}++, 0, chr $uni;
1729 } else {
1730 return 0;
1597 } 1731 }
1598 1732
1599 $self->_set_text ($text); 1733 $self->_set_text ($text);
1600 $self->update; 1734
1601 $self->check_size; 1735 $self->realloc;
1736
1737 1
1602} 1738}
1603 1739
1604sub focus_in { 1740sub focus_in {
1605 my ($self) = @_; 1741 my ($self) = @_;
1606 1742
… …
1621 utf8::encode $text; 1757 utf8::encode $text;
1622 $self->{cursor} = length substr $text, 0, $idx; 1758 $self->{cursor} = length substr $text, 0, $idx;
1623 1759
1624 $self->_set_text ($self->{text}); 1760 $self->_set_text ($self->{text});
1625 $self->update; 1761 $self->update;
1762
1763 1
1626} 1764}
1627 1765
1628sub mouse_motion { 1766sub mouse_motion {
1629 my ($self, $ev, $x, $y) = @_; 1767 my ($self, $ev, $x, $y) = @_;
1630# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1768# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1769
1770 0
1631} 1771}
1632 1772
1633sub _draw { 1773sub _draw {
1634 my ($self) = @_; 1774 my ($self) = @_;
1635 1775
… …
1712 } else { 1852 } else {
1713 $self->set_text ($self->{history_saveback}); 1853 $self->set_text ($self->{history_saveback});
1714 } 1854 }
1715 1855
1716 } else { 1856 } else {
1717 $self->SUPER::key_down ($ev); 1857 return $self->SUPER::key_down ($ev)
1858 }
1859
1718 } 1860 1
1719
1720} 1861}
1721 1862
1722############################################################################# 1863#############################################################################
1723 1864
1724package CFClient::UI::Button; 1865package CFClient::UI::Button;
… …
1733 1874
1734sub new { 1875sub new {
1735 my $class = shift; 1876 my $class = shift;
1736 1877
1737 $class->SUPER::new ( 1878 $class->SUPER::new (
1738 padding => 4, 1879 padding_x => 4,
1880 padding_y => 4,
1739 fg => [1, 1, 1], 1881 fg => [1, 1, 1],
1740 active_fg => [0, 0, 1], 1882 active_fg => [0, 0, 1],
1741 can_hover => 1, 1883 can_hover => 1,
1742 align => 0, 1884 align => 0,
1743 valign => 0, 1885 valign => 0,
… …
1752 my ($self, $ev, $x, $y) = @_; 1894 my ($self, $ev, $x, $y) = @_;
1753 1895
1754 $self->emit ("activate") 1896 $self->emit ("activate")
1755 if $x >= 0 && $x < $self->{w} 1897 if $x >= 0 && $x < $self->{w}
1756 && $y >= 0 && $y < $self->{h}; 1898 && $y >= 0 && $y < $self->{h};
1899
1900 1
1757} 1901}
1758 1902
1759sub _draw { 1903sub _draw {
1760 my ($self) = @_; 1904 my ($self) = @_;
1761 1905
… …
1790 1934
1791sub new { 1935sub new {
1792 my $class = shift; 1936 my $class = shift;
1793 1937
1794 $class->SUPER::new ( 1938 $class->SUPER::new (
1795 padding => 2, 1939 padding_x => 2,
1940 padding_y => 2,
1796 fg => [1, 1, 1], 1941 fg => [1, 1, 1],
1797 active_fg => [1, 1, 0], 1942 active_fg => [1, 1, 0],
1798 bg => [0, 0, 0, 0.2], 1943 bg => [0, 0, 0, 0.2],
1799 active_bg => [1, 1, 1, 0.5], 1944 active_bg => [1, 1, 1, 0.5],
1800 state => 0, 1945 state => 0,
… …
1804} 1949}
1805 1950
1806sub size_request { 1951sub size_request {
1807 my ($self) = @_; 1952 my ($self) = @_;
1808 1953
1809 ($self->{padding} * 2 + 6) x 2 1954 (6) x 2
1810} 1955}
1811 1956
1812sub button_down { 1957sub button_down {
1813 my ($self, $ev, $x, $y) = @_; 1958 my ($self, $ev, $x, $y) = @_;
1814 1959
1815 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1960 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1816 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1961 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1817 $self->{state} = !$self->{state}; 1962 $self->{state} = !$self->{state};
1818 $self->_emit (changed => $self->{state}); 1963 $self->_emit (changed => $self->{state});
1964 } else {
1965 return 0
1966 }
1967
1819 } 1968 1
1820} 1969}
1821 1970
1822sub _draw { 1971sub _draw {
1823 my ($self) = @_; 1972 my ($self) = @_;
1824 1973
1825 $self->SUPER::_draw; 1974 $self->SUPER::_draw;
1826 1975
1827 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1976 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1828 1977
1829 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1978 my ($w, $h) = @$self{qw(w h)};
1979
1980 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1830 1981
1831 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1982 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1832 1983
1833 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1984 my $tex = $self->{state} ? $tex[1] : $tex[0];
1834 1985
… …
2099 fg => [1, 1, 1], 2250 fg => [1, 1, 1],
2100 active_fg => [0, 0, 0], 2251 active_fg => [0, 0, 0],
2101 bg => [0, 0, 0, 0.2], 2252 bg => [0, 0, 0, 0.2],
2102 active_bg => [1, 1, 1, 0.5], 2253 active_bg => [1, 1, 1, 0.5],
2103 range => [0, 0, 100, 10, 0], 2254 range => [0, 0, 100, 10, 0],
2104 req_w => $::WIDTH / 80, 2255 min_w => $::WIDTH / 80,
2105 req_h => $::WIDTH / 80, 2256 min_h => $::WIDTH / 80,
2106 vertical => 0, 2257 vertical => 0,
2107 can_hover => 1, 2258 can_hover => 1,
2108 inner_pad => 0.02, 2259 inner_pad => 0.02,
2109 @_ 2260 @_
2110 ); 2261 );
… …
2113 $self->update; 2264 $self->update;
2114 2265
2115 $self 2266 $self
2116} 2267}
2117 2268
2269sub changed { }
2270
2118sub set_range { 2271sub set_range {
2119 my ($self, $range) = @_; 2272 my ($self, $range) = @_;
2120 2273
2121 $self->{range} = $range; 2274 ($range, $self->{range}) = ($self->{range}, $range);
2122 2275
2123 $self->update; 2276 $self->update
2277 if "@$range" ne "@{$self->{range}}";
2124} 2278}
2125 2279
2126sub set_value { 2280sub set_value {
2127 my ($self, $value) = @_; 2281 my ($self, $value) = @_;
2128 2282
… …
2147} 2301}
2148 2302
2149sub size_request { 2303sub size_request {
2150 my ($self) = @_; 2304 my ($self) = @_;
2151 2305
2152 my $w = $self->{req_w}; 2306 ($self->{req_w}, $self->{req_h})
2153 my $h = $self->{req_h};
2154
2155 $self->{vertical} ? ($h, $w) : ($w, $h)
2156} 2307}
2157 2308
2158sub button_down { 2309sub button_down {
2159 my ($self, $ev, $x, $y) = @_; 2310 my ($self, $ev, $x, $y) = @_;
2160 2311
2161 $self->SUPER::button_down ($ev, $x, $y); 2312 $self->SUPER::button_down ($ev, $x, $y);
2162 2313
2163 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2314 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2164 2315
2165 $self->mouse_motion ($ev, $x, $y); 2316 $self->mouse_motion ($ev, $x, $y)
2166} 2317}
2167 2318
2168sub mouse_motion { 2319sub mouse_motion {
2169 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2170 2321
… …
2174 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2325 my (undef, $lo, $hi, $page) = @{$self->{range}};
2175 2326
2176 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2327 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2177 2328
2178 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2329 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2330 } else {
2331 return 0;
2332 }
2333
2179 } 2334 1
2180} 2335}
2181 2336
2182sub update { 2337sub update {
2183 my ($self) = @_; 2338 my ($self) = @_;
2184 2339
… …
2511 2666
2512sub new { 2667sub new {
2513 my $class = shift; 2668 my $class = shift;
2514 2669
2515 my $self = $class->SUPER::new ( 2670 my $self = $class->SUPER::new (
2516 state => 0, 2671 state => 0,
2517 connect_activate => \&toggle_flopper, 2672 on_activate => \&toggle_flopper,
2518 @_ 2673 @_
2519 ); 2674 );
2520 2675
2521 if ($self->{state}) {
2522 $self->{state} = 0;
2523 $self->toggle_flopper;
2524 }
2525
2526 $self 2676 $self
2527} 2677}
2528 2678
2529sub toggle_flopper { 2679sub toggle_flopper {
2530 my ($self) = @_; 2680 my ($self) = @_;
2531 2681
2532 # TODO: use animation 2682 $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} 2683}
2544 2684
2545############################################################################# 2685#############################################################################
2546 2686
2547package CFClient::UI::Tooltip; 2687package CFClient::UI::Tooltip;
… …
2560} 2700}
2561 2701
2562sub set_tooltip_from { 2702sub set_tooltip_from {
2563 my ($self, $widget) = @_; 2703 my ($self, $widget) = @_;
2564 2704
2705 my $tooltip = $widget->{tooltip};
2706
2707 if ($ENV{CFPLUS_DEBUG} & 2) {
2708 $tooltip .= "\n\n" . (ref $widget) . "\n"
2709 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2710 . "req $widget->{req_w} $widget->{req_h}\n"
2711 . "visible $widget->{visible}";
2712 }
2713
2565 $self->add (new CFClient::UI::Label 2714 $self->add (new CFClient::UI::Label
2566 markup => $widget->{tooltip}, 2715 markup => $tooltip,
2567 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2716 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2568 fontsize => 0.8, 2717 fontsize => 0.8,
2569 fg => [0, 0, 0, 1], 2718 fg => [0, 0, 0, 1],
2570 ellipsise => 0, 2719 ellipsise => 0,
2571 font => ($widget->{tooltip_font} || $::FONT_PROP), 2720 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2582 2731
2583sub size_allocate { 2732sub size_allocate {
2584 my ($self, $w, $h) = @_; 2733 my ($self, $w, $h) = @_;
2585 2734
2586 $self->SUPER::size_allocate ($w - 4, $h - 4); 2735 $self->SUPER::size_allocate ($w - 4, $h - 4);
2736}
2737
2738sub visibility_change {
2739 my ($self, $visible) = @_;
2740
2741 return unless $visible;
2742
2743 $self->{root}->on_post_alloc ("move_$self" => sub {
2744 my $widget = $self->{owner}
2745 or return;
2746
2747 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2748
2749 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2750 if $x + $self->{w} > $::WIDTH;
2751
2752 $self->move_abs ($x, $y);
2753 });
2587} 2754}
2588 2755
2589sub _draw { 2756sub _draw {
2590 my ($self) = @_; 2757 my ($self) = @_;
2591 2758
… …
2608 glVertex $w, $h; 2775 glVertex $w, $h;
2609 glVertex $w, 0; 2776 glVertex $w, 0;
2610 glEnd; 2777 glEnd;
2611 2778
2612 glTranslate 2 - 0.375, 2 - 0.375; 2779 glTranslate 2 - 0.375, 2 - 0.375;
2780
2613 $self->SUPER::_draw; 2781 $self->SUPER::_draw;
2614} 2782}
2615 2783
2616############################################################################# 2784#############################################################################
2617 2785
… …
2623 2791
2624sub new { 2792sub new {
2625 my $class = shift; 2793 my $class = shift;
2626 2794
2627 my $self = $class->SUPER::new ( 2795 my $self = $class->SUPER::new (
2628 aspect => 1, 2796 aspect => 1,
2797 can_events => 0,
2629 @_, 2798 @_,
2630 ); 2799 );
2631 2800
2632 if ($self->{anim} && $self->{animspeed}) { 2801 if ($self->{anim} && $self->{animspeed}) {
2633 Scalar::Util::weaken (my $widget = $self); 2802 Scalar::Util::weaken (my $widget = $self);
… …
2692 $self->SUPER::DESTROY; 2861 $self->SUPER::DESTROY;
2693} 2862}
2694 2863
2695############################################################################# 2864#############################################################################
2696 2865
2697package CFClient::UI::InventoryItem; 2866package CFClient::UI::Buttonbar;
2698 2867
2699our @ISA = CFClient::UI::HBox::; 2868our @ISA = CFClient::UI::HBox::;
2700 2869
2701sub _item_to_desc { 2870# 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 2871
2858############################################################################# 2872#############################################################################
2859 2873
2860package CFClient::UI::Menu; 2874package CFClient::UI::Menu;
2861 2875
… …
2902 # maybe save $GRAB? must be careful about events... 2916 # maybe save $GRAB? must be careful about events...
2903 $GRAB = $self; 2917 $GRAB = $self;
2904 $self->{button} = $ev->{button}; 2918 $self->{button} = $ev->{button};
2905 2919
2906 $self->show; 2920 $self->show;
2907 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2921 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2908} 2922}
2909 2923
2910sub mouse_motion { 2924sub mouse_motion {
2911 my ($self, $ev, $x, $y) = @_; 2925 my ($self, $ev, $x, $y) = @_;
2912 2926
2913 # TODO: should use vbox->find_widget or so 2927 # TODO: should use vbox->find_widget or so
2914 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2928 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2915 $self->{hover} = $self->{item}{$HOVER}; 2929 $self->{hover} = $self->{item}{$HOVER};
2930
2931 0
2916} 2932}
2917 2933
2918sub button_up { 2934sub button_up {
2919 my ($self, $ev, $x, $y) = @_; 2935 my ($self, $ev, $x, $y) = @_;
2920 2936
… …
2922 undef $GRAB; 2938 undef $GRAB;
2923 $self->hide; 2939 $self->hide;
2924 2940
2925 $self->_emit ("popdown"); 2941 $self->_emit ("popdown");
2926 $self->{hover}[1]->() if $self->{hover}; 2942 $self->{hover}[1]->() if $self->{hover};
2943 } else {
2944 return 0
2945 }
2946
2927 } 2947 1
2948}
2949
2950#############################################################################
2951
2952package CFClient::UI::Multiplexer;
2953
2954our @ISA = CFClient::UI::Container::;
2955
2956sub new {
2957 my $class = shift;
2958
2959 my $self = $class->SUPER::new (
2960 @_,
2961 );
2962
2963 $self->{current} = $self->{children}[0]
2964 if @{ $self->{children} };
2965
2966 $self
2967}
2968
2969sub add {
2970 my ($self, @widgets) = @_;
2971
2972 $self->SUPER::add (@widgets);
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976}
2977
2978sub set_current_page {
2979 my ($self, $page_or_widget) = @_;
2980
2981 my $widget = ref $page_or_widget
2982 ? $page_or_widget
2983 : $self->{children}[$page_or_widget];
2984
2985 $self->{current} = $widget;
2986 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2987
2988 $self->_emit (page_changed => $self->{current});
2989
2990 $self->realloc;
2991}
2992
2993sub visible_children {
2994 $_[0]{current}
2995}
2996
2997sub size_request {
2998 my ($self) = @_;
2999
3000 $self->{current}->size_request
3001}
3002
3003sub size_allocate {
3004 my ($self, $w, $h) = @_;
3005
3006 $self->{current}->configure (0, 0, $w, $h);
3007}
3008
3009sub _draw {
3010 my ($self) = @_;
3011
3012 $self->{current}->draw;
3013}
3014
3015#############################################################################
3016
3017package CFClient::UI::Notebook;
3018
3019our @ISA = CFClient::UI::VBox::;
3020
3021sub new {
3022 my $class = shift;
3023
3024 my $self = $class->SUPER::new (
3025 buttonbar => (new CFClient::UI::Buttonbar),
3026 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3027 @_,
3028 );
3029
3030 $self->SUPER::add ($self->{buttonbar}, $self->{multiplexer});
3031
3032 $self
3033}
3034
3035sub add {
3036 my ($self, $title, $widget, $tooltip) = @_;
3037
3038 Scalar::Util::weaken $self;
3039
3040 $self->{buttonbar}->add (new CFClient::UI::Button
3041 markup => $title,
3042 tooltip => $tooltip,
3043 on_activate => sub { $self->set_current_page ($widget) },
3044 );
3045
3046 $self->{multiplexer}->add ($widget);
3047}
3048
3049sub set_current_page {
3050 my ($self, $page) = @_;
3051
3052 $self->{multiplexer}->set_current_page ($page);
3053 $self->_emit (page_changed => $self->{multiplexer}{current});
2928} 3054}
2929 3055
2930############################################################################# 3056#############################################################################
2931 3057
2932package CFClient::UI::Statusbox; 3058package CFClient::UI::Statusbox;
… …
2992sub add { 3118sub add {
2993 my ($self, $text, %arg) = @_; 3119 my ($self, $text, %arg) = @_;
2994 3120
2995 $text =~ s/^\s+//; 3121 $text =~ s/^\s+//;
2996 $text =~ s/\s+$//; 3122 $text =~ s/\s+$//;
3123
3124 return unless $text;
2997 3125
2998 my $timeout = time + ((delete $arg{timeout}) || 60); 3126 my $timeout = time + ((delete $arg{timeout}) || 60);
2999 3127
3000 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3128 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3001 3129
… …
3035 $self->SUPER::reconfigure; 3163 $self->SUPER::reconfigure;
3036} 3164}
3037 3165
3038############################################################################# 3166#############################################################################
3039 3167
3040package CFClient::UI::Root; 3168package CFClient::UI::Inventory;
3041 3169
3042our @ISA = CFClient::UI::Container::; 3170our @ISA = CFClient::UI::ScrolledWindow::;
3043
3044use CFClient::OpenGL;
3045 3171
3046sub new { 3172sub new {
3047 my $class = shift; 3173 my $class = shift;
3048 3174
3049 $class->SUPER::new ( 3175 my $self = $class->SUPER::new (
3176 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3177 @_,
3178 );
3179
3180 $self
3181}
3182
3183sub set_items {
3184 my ($self, $items) = @_;
3185
3186 $self->{scrolled}->clear;
3187 return unless $items;
3188
3189 my @items = sort {
3190 ($a->{type} <=> $b->{type})
3191 or ($a->{name} cmp $b->{name})
3192 } @$items;
3193
3194 $self->{real_items} = \@items;
3195
3196 my $row = 0;
3197 for my $item (@items) {
3198 CFClient::Item::update_widgets $item;
3199
3200 $self->{scrolled}->add (0, $row, $item->{face_widget});
3201 $self->{scrolled}->add (1, $row, $item->{desc_widget});
3202 $self->{scrolled}->add (2, $row, $item->{weight_widget});
3203
3204 $row++;
3205 }
3206}
3207
3208#############################################################################
3209
3210package CFClient::UI::BindEditor;
3211
3212our @ISA = CFClient::UI::FancyFrame::;
3213
3214sub new {
3215 my $class = shift;
3216
3217 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3218
3219 $self->add (my $vb = new CFClient::UI::VBox);
3220
3221
3222 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3223 text => "start recording",
3224 tooltip => "Start/Stops recording of actions."
3225 ."All subsequent actions after the recording started will be captured."
3226 ."The actions are displayed after the record was stopped."
3227 ."To bind the action you have to click on the 'Bind' button",
3228 on_activate => sub {
3229 unless ($self->{recording}) {
3230 $self->start;
3231 } else {
3232 $self->stop;
3233 }
3234 });
3235
3236 $vb->add (new CFClient::UI::Label text => "Actions:");
3237 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3238
3239 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3240 $vb->add (my $hb = new CFClient::UI::HBox);
3241 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3242 $hb->add (new CFClient::UI::Button
3243 text => "bind",
3244 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3245 on_activate => sub {
3246 $self->ask_for_bind;
3247 });
3248
3249 $vb->add (my $hb = new CFClient::UI::HBox);
3250 $hb->add (new CFClient::UI::Button
3251 text => "ok",
3252 expand => 1,
3253 tooltip => "This closes the binding editor and saves the binding",
3254 on_activate => sub {
3255 $self->hide;
3256 $self->commit;
3257 });
3258
3259 $hb->add (new CFClient::UI::Button
3260 text => "cancel",
3261 expand => 1,
3262 tooltip => "This closes the binding editor without saving",
3263 on_activate => sub {
3264 $self->hide;
3265 $self->{binding_cancel}->()
3266 if $self->{binding_cancel};
3267 });
3268
3269 $self->update_binding_widgets;
3270
3271 $self
3272}
3273
3274sub commit {
3275 my ($self) = @_;
3276 my ($mod, $sym, $cmds) = $self->get_binding;
3277 if ($sym != 0 && @$cmds > 0) {
3278 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3279 ."'. Don't forget 'Save Config'!");
3280 $self->{binding_change}->($mod, $sym, $cmds)
3281 if $self->{binding_change};
3282 } else {
3283 $::STATUSBOX->add ("No action bound, no key or action specified!");
3284 $self->{binding_cancel}->()
3285 if $self->{binding_cancel};
3286 }
3287}
3288
3289sub start {
3290 my ($self) = @_;
3291
3292 $self->{rec_btn}->set_text ("stop recording");
3293 $self->{recording} = 1;
3294 $self->clear_command_list;
3295 $::CONN->start_record if $::CONN;
3296}
3297
3298sub stop {
3299 my ($self) = @_;
3300
3301 $self->{rec_btn}->set_text ("start recording");
3302 $self->{recording} = 0;
3303
3304 my $rec;
3305 $rec = $::CONN->stop_record if $::CONN;
3306 return unless ref $rec eq 'ARRAY';
3307 $self->set_command_list ($rec);
3308}
3309
3310
3311sub ask_for_bind_and_commit {
3312 my ($self) = @_;
3313 $self->ask_for_bind (1);
3314}
3315
3316sub ask_for_bind {
3317 my ($self, $commit) = @_;
3318
3319 CFClient::Binder::open_binding_dialog (sub {
3320 my ($mod, $sym) = @_;
3321 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3322 $self->update_binding_widgets;
3323 $self->commit if $commit;
3324 });
3325}
3326
3327# $mod and $sym are the modifiers and key symbol
3328# $cmds is a array ref of strings (the commands)
3329# $cb is the callback that is executed on OK
3330# $ccb is the callback that is executed on CANCEL and
3331# when the binding was unsuccessful on OK
3332sub set_binding {
3333 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3334
3335 $self->clear_command_list;
3336 $self->{recording} = 0;
3337 $self->{rec_btn}->set_text ("start recording");
3338
3339 $self->{binding} = [$mod, $sym];
3340 $self->{commands} = $cmds;
3341
3342 $self->{binding_change} = $cb;
3343 $self->{binding_cancel} = $ccb;
3344
3345 $self->update_binding_widgets;
3346}
3347
3348# this is a shortcut method that asks for a binding
3349# and then just binds it.
3350sub do_quick_binding {
3351 my ($self, $cmds) = @_;
3352 $self->set_binding (undef, undef, $cmds, sub {
3353 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3354 });
3355 $self->ask_for_bind (1);
3356}
3357
3358sub update_binding_widgets {
3359 my ($self) = @_;
3360 my ($mod, $sym, $cmds) = $self->get_binding;
3361 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3362 $self->set_command_list ($cmds);
3363}
3364
3365sub get_binding {
3366 my ($self) = @_;
3367 return (
3368 $self->{binding}->[0],
3369 $self->{binding}->[1],
3370 [ grep { defined $_ } @{$self->{commands}} ]
3371 );
3372}
3373
3374sub clear_command_list {
3375 my ($self) = @_;
3376 $self->{cmdbox}->clear ();
3377}
3378
3379sub set_command_list {
3380 my ($self, $cmds) = @_;
3381
3382 $self->{cmdbox}->clear ();
3383 $self->{commands} = $cmds;
3384
3385 my $idx = 0;
3386
3387 for (@$cmds) {
3388 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3389
3390 my $i = $idx;
3391 $hb->add (new CFClient::UI::Label text => $_);
3392 $hb->add (new CFClient::UI::Button
3393 text => "delete",
3394 tooltip => "Deletes the action from the record",
3395 on_activate => sub {
3396 $self->{cmdbox}->remove ($hb);
3397 $cmds->[$i] = undef;
3398 });
3399
3400
3401 $idx++
3402 }
3403}
3404
3405#############################################################################
3406
3407package CFClient::UI::SpellList;
3408
3409our @ISA = CFClient::UI::ScrolledWindow::;
3410
3411sub new {
3412 my $class = shift;
3413
3414 my $self = $class->SUPER::new (
3415 binding => [],
3416 commands => [],
3417 scrolled => (new CFClient::UI::Table),
3050 @_, 3418 @_,
3051 ) 3419 )
3052} 3420}
3053 3421
3054sub configure { 3422# XXX: Do sorting? Argl...
3055 my ($self, $x, $y, $w, $h) = @_; 3423sub add_spell {
3056
3057 $self->{w} = $w;
3058 $self->{h} = $h;
3059}
3060
3061sub check_size {
3062 my ($self) = @_; 3424 my ($self, $spell) = @_;
3425 $self->{spells}->{$spell->{name}} = $spell;
3063 3426
3064 $self->size_allocate ($self->{w}, $self->{h}) 3427 $self->{scrolled}->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3065 if $self->{w}; 3428 face => $spell->{face},
3429 can_hover => 1,
3430 can_events => 1,
3431 tooltip => $spell->{message});
3432
3433 $self->{scrolled}->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3434 text => $spell->{name},
3435 can_hover => 1,
3436 can_events => 1,
3437 tooltip => $spell->{message},
3438 expand => 1);
3439
3440 $self->{scrolled}->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3441 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3442 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3443 expand => 1);
3444
3445 $self->{scrolled}->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3446 text => "bind to key",
3447 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3448}
3449
3450sub rebuild_spell_list {
3451 my ($self) = @_;
3452 $self->{tbl_idx} = 0;
3453 $self->add_spell ($_) for values %{$self->{spells}};
3454}
3455
3456sub remove_spell {
3457 my ($self, $spell) = @_;
3458 delete $self->{spells}->{$spell->{name}};
3459 $self->rebuild_spell_list;
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::Root;
3465
3466our @ISA = CFClient::UI::Container::;
3467
3468use CFClient::OpenGL;
3469
3470sub new {
3471 my $class = shift;
3472
3473 my $self = $class->SUPER::new (
3474 visible => 1,
3475 @_,
3476 );
3477
3478 Scalar::Util::weaken ($self->{root} = $self);
3479
3480 $self
3066} 3481}
3067 3482
3068sub size_request { 3483sub size_request {
3069 my ($self) = @_; 3484 my ($self) = @_;
3070 3485
3071 ($self->{w}, $self->{h}) 3486 ($self->{w}, $self->{h})
3487}
3488
3489sub _to_pixel {
3490 my ($coord, $size, $max) = @_;
3491
3492 $coord =
3493 $coord eq "center" ? ($max - $size) * 0.5
3494 : $coord eq "max" ? $max
3495 : $coord;
3496
3497 $coord = 0 if $coord < 0;
3498 $coord = $max - $size if $coord > $max - $size;
3499
3500 int $coord + 0.5
3072} 3501}
3073 3502
3074sub size_allocate { 3503sub size_allocate {
3075 my ($self, $w, $h) = @_; 3504 my ($self, $w, $h) = @_;
3076 3505
3077 for my $child ($self->children) { 3506 for my $child ($self->children) {
3078 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3507 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3079 3508
3080 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3509 $X = $child->{force_x} if exists $child->{force_x};
3081 if exists $child->{req_x}; 3510 $Y = $child->{force_y} if exists $child->{force_y};
3082 3511
3083 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3512 $X = _to_pixel $X, $W, $self->{w};
3084 if exists $child->{req_y}; 3513 $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 3514
3089 $child->configure ($X, $Y, $W, $H); 3515 $child->configure ($X, $Y, $W, $H);
3090 } 3516 }
3091} 3517}
3092 3518
… …
3103} 3529}
3104 3530
3105sub update { 3531sub update {
3106 my ($self) = @_; 3532 my ($self) = @_;
3107 3533
3108 $self->check_size;
3109 $::WANT_REFRESH++; 3534 $::WANT_REFRESH++;
3110} 3535}
3111 3536
3112sub add { 3537sub add {
3113 my ($self, @children) = @_; 3538 my ($self, @children) = @_;
3114 3539
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; 3540 $_->{is_toplevel} = 1
3123 3541 for @children;
3124 # integerise window positions
3125 $child->{x} = int $child->{x};
3126 $child->{y} = int $child->{y};
3127 }
3128 3542
3129 $self->SUPER::add (@children); 3543 $self->SUPER::add (@children);
3130} 3544}
3131 3545
3132sub remove { 3546sub remove {
3133 my ($self, @children) = @_; 3547 my ($self, @children) = @_;
3134 3548
3135 $self->SUPER::remove (@children); 3549 $self->SUPER::remove (@children);
3550
3551 delete $self->{is_toplevel}
3552 for @children;
3136 3553
3137 while (@children) { 3554 while (@children) {
3138 my $w = pop @children; 3555 my $w = pop @children;
3139 push @children, $w->children; 3556 push @children, $w->children;
3140 $w->set_invisible; 3557 $w->set_invisible;
… …
3159 while ($self->{refresh_hook}) { 3576 while ($self->{refresh_hook}) {
3160 $_->() 3577 $_->()
3161 for values %{delete $self->{refresh_hook}}; 3578 for values %{delete $self->{refresh_hook}};
3162 } 3579 }
3163 3580
3164 if ($self->{check_size}) { 3581 if ($self->{realloc}) {
3165 my @queue = ([], []); 3582 my %queue;
3583 my @queue;
3584 my $widget;
3166 3585
3167 for (;;) { 3586 outer:
3168 if ($self->{check_size}) { 3587 while () {
3169 # heuristic: check containers last 3588 if (my $realloc = delete $self->{realloc}) {
3170 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3589 for $widget (values %$realloc) {
3171 for values %{delete $self->{check_size}} 3590 $widget->{visible} or next; # do not resize invisible widgets
3591
3592 $queue{$widget+0}++ and next; # duplicates are common
3593
3594 push @{ $queue[$widget->{visible}] }, $widget;
3595 }
3172 } 3596 }
3173 3597
3174 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3598 while () {
3599 @queue or last outer;
3175 3600
3176 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3601 $widget = pop @{ $queue[-1] || [] }
3177 ? @$widget{qw(user_w user_h)} 3602 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 3603
3604 pop @queue;
3605 }
3606
3607 delete $queue{$widget+0};
3608
3609 my ($w, $h) = $widget->size_request;
3610
3611 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3612 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3613
3614 $w = $widget->{force_w} if exists $widget->{force_w};
3615 $h = $widget->{force_h} if exists $widget->{force_h};
3616
3617 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3618 || delete $widget->{force_realloc}) {
3184 $widget->{req_w} = $w; 3619 $widget->{req_w} = $w;
3185 $widget->{req_h} = $h; 3620 $widget->{req_h} = $h;
3186 3621
3187 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3622 $self->{size_alloc}{$widget+0} = $widget;
3188 3623
3189 $widget->{parent}->check_size
3190 if $widget->{parent}; 3624 if (my $parent = $widget->{parent}) {
3625 $self->{realloc}{$parent+0} = $parent
3626 unless $queue{$parent+0};
3627
3628 $parent->{force_size_alloc} = 1;
3629 $self->{size_alloc}{$parent+0} = $parent;
3630 }
3191 } 3631 }
3632
3633 delete $self->{realloc}{$widget+0};
3192 } 3634 }
3193 } 3635 }
3194 3636
3195 while ($self->{size_alloc}) { 3637 while (my $size_alloc = delete $self->{size_alloc}) {
3196 for (values %{delete $self->{size_alloc}}) { 3638 my @queue = sort { $b->{visible} <=> $a->{visible} }
3197 my ($widget, $w, $h) = @$_; 3639 values %$size_alloc;
3640
3641 while () {
3642 my $widget = pop @queue || last;
3643
3644 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3198 3645
3199 $w = 0 if $w < 0; 3646 $w = 0 if $w < 0;
3200 $h = 0 if $h < 0; 3647 $h = 0 if $h < 0;
3201 3648
3649 $w = int $w + 0.5;
3650 $h = int $h + 0.5;
3651
3652 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3653 $widget->{old_w} = $widget->{w};
3654 $widget->{old_h} = $widget->{h};
3655
3202 $widget->{w} = $w; 3656 $widget->{w} = $w;
3203 $widget->{h} = $h; 3657 $widget->{h} = $h;
3658
3204 $widget->emit (size_allocate => $w, $h); 3659 $widget->emit (size_allocate => $w, $h);
3660 }
3205 } 3661 }
3206 } 3662 }
3207 3663
3208 while ($self->{post_alloc_hook}) { 3664 while ($self->{post_alloc_hook}) {
3209 $_->() 3665 $_->()
3210 for values %{delete $self->{post_alloc_hook}}; 3666 for values %{delete $self->{post_alloc_hook}};
3211 } 3667 }
3668
3212 3669
3213 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3670 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3214 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3671 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3215 glClear GL_COLOR_BUFFER_BIT; 3672 glClear GL_COLOR_BUFFER_BIT;
3216 3673
… …
3218 glLoadIdentity; 3675 glLoadIdentity;
3219 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3676 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3220 glMatrixMode GL_MODELVIEW; 3677 glMatrixMode GL_MODELVIEW;
3221 glLoadIdentity; 3678 glLoadIdentity;
3222 3679
3680 {
3681 package CFClient::UI::Base;
3682
3683 ($draw_x, $draw_y, $draw_w, $draw_h) =
3684 (0, 0, $self->{w}, $self->{h});
3685 }
3686
3223 $self->_draw; 3687 $self->_draw;
3224} 3688}
3225 3689
3226############################################################################# 3690#############################################################################
3227 3691

Diff Legend

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