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.248 by root, Sun May 28 01:37:45 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
29 } 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};
30 31
31 return $LAYOUT; 32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
32} 36}
33 37
34sub set_layout { 38sub set_layout {
35 my ($layout) = @_; 39 my ($layout) = @_;
40
36 $LAYOUT = $layout; 41 $LAYOUT = $layout;
37} 42}
38 43
39sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
40 if (!$GRAB) { 47 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
45 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
46 54
47 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
48 56
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 58
51 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 60 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 61 }
63 62
64 return; 63 return;
65 } 64 }
66 } 65 }
172sub rescale_widgets { 171sub rescale_widgets {
173 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
174 173
175 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $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.]+$/;
181 $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};
182 $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};
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
183 } 189 }
184 } 190 }
185 191
186 reconfigure_widgets; 192 reconfigure_widgets;
187} 193}
196 202
197sub new { 203sub new {
198 my $class = shift; 204 my $class = shift;
199 205
200 my $self = bless { 206 my $self = bless {
201 x => 0, 207 x => "center",
202 y => 0, 208 y => "center",
203 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
204 can_events => 1, 212 can_events => 1,
205 @_ 213 @_
206 }, $class; 214 }, $class;
215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 217
208 for (keys %$self) { 218 for (keys %$self) {
209 if (/^on_(.*)$/) { 219 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
211 } 221 }
212 } 222 }
213 223
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
220 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
221 } 234 }
222 235
223 $self 236 $self
224}
225
226sub toggle_visibility {
227 my ($self) = @_;
228
229 if ($self->{visible}) {
230 $self->hide;
231 } else {
232 $self->show;
233 }
234} 237}
235 238
236sub destroy { 239sub destroy {
237 my ($self) = @_; 240 my ($self) = @_;
238 241
246 return if $self->{parent}; 249 return if $self->{parent};
247 250
248 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
249} 252}
250 253
251sub center {
252 my ($self) = @_;
253
254 $CFClient::UI::ROOT->on_post_alloc (
255 "center_$self" => sub {
256 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
257 },
258 );
259
260 $self->update;
261}
262
263sub set_visible { 254sub set_visible {
264 my ($self) = @_; 255 my ($self) = @_;
265 256
266 return if $self->{visible}; 257 return if $self->{visible};
267 258
268 $self->{root} = $self->{parent}{root}; 259 $self->{root} = $self->{parent}{root};
269 $self->{visible} = $self->{parent}{visible} + 1; 260 $self->{visible} = $self->{parent}{visible} + 1;
270 261
271 $self->emit (visibility_change => 1); 262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
272} 267}
273 268
274sub set_invisible { 269sub set_invisible {
275 my ($self) = @_; 270 my ($self) = @_;
276 271
277 return unless $self->{visible}; 272 return unless $self->{visible};
278 273
279 # broken show/hide model 274 $_->set_invisible for $self->children;
280 275
281 delete $self->{root}; 276 delete $self->{root};
282 delete $self->{visible}; 277 delete $self->{visible};
283 278
284 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
285 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
286 281
287 CFClient::UI::check_tooltip 282 CFClient::UI::check_tooltip
288 if $CFClient::UI::TOOLTIP->{owner} == $self; 283 if $TOOLTIP->{owner} == $self;
289 284
290 $self->focus_out; 285 $self->focus_out;
291 286
292 $self->emit (visibility_change => 0); 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;
293} 305}
294 306
295sub hide { 307sub hide {
296 my ($self) = @_; 308 my ($self) = @_;
297 309
299 311
300 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
301 if $self->{parent}; 313 if $self->{parent};
302} 314}
303 315
304sub move { 316sub move_abs {
305 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
306 318
307 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
308 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
309 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
310 322
311 $self->update; 323 $self->update;
312} 324}
313 325
314sub set_size { 326sub set_size {
315 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
316 328
317 $self->{def_w} = $w; 329 $self->{force_w} = $w;
318 $self->{def_h} = $h; 330 $self->{force_h} = $h;
319 331
320 $self->check_size; 332 $self->realloc;
321} 333}
322 334
323sub size_request { 335sub size_request {
324 require Carp; 336 require Carp;
325 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
327 339
328sub configure { 340sub configure {
329 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
330 342
331 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
332 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
333 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
334 348
335 # use alignment to adjust x, y 349 # use alignment to adjust x, y
336 350
337 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
338 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
339
340 ($w, $h) = ($w2, $h2);
341 } 353 }
342 354
343 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
344 $self->{x} = $x; 356 $self->{x} = $x;
345 $self->{y} = $y; 357 $self->{y} = $y;
346 $self->update; 358 $self->update;
347 } 359 }
348 360
349 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
350 $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;
351 } 368 }
352} 369}
353 370
354sub size_allocate { 371sub size_allocate {
355 # nothing to be done 372 # nothing to be done
356} 373}
357 374
358sub reconfigure {
359 my ($self) = @_;
360
361 $self->check_size (1);
362 $self->update;
363}
364
365sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
366} 381}
367 382
368sub set_max_size { 383sub set_max_size {
369 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
370 385
429 444
430 $::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
431 unless $FOCUS; 446 unless $FOCUS;
432} 447}
433 448
434sub mouse_motion { } 449sub mouse_motion { 0 }
435sub button_up { } 450sub button_up { 0 }
436sub key_down { } 451sub key_down { 0 }
437sub key_up { } 452sub key_up { 0 }
438 453
439sub button_down { 454sub button_down {
440 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
441 456
442 $self->focus_in; 457 $self->focus_in;
443}
444 458
445sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
446sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
447sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
448sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
449sub 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
450 535
451sub draw { 536sub draw {
452 my ($self) = @_; 537 my ($self) = @_;
453 538
454 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);
455 550
456 glPushMatrix; 551 glPushMatrix;
457 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
458 $self->_draw;
459 glPopMatrix;
460 553
461 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
462 my ($x, $y) = @$self{qw(x y)};
463
464 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
465 glEnable GL_BLEND; 556 glEnable GL_BLEND;
466 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
467 glBegin GL_QUADS; 558 glBegin GL_QUADS;
468 glVertex $x , $y; 559 glVertex 0 , 0;
469 glVertex $x + $self->{w}, $y; 560 glVertex $self->{w}, 0;
470 glVertex $x + $self->{w}, $y + $self->{h}; 561 glVertex $self->{w}, $self->{h};
471 glVertex $x , $y + $self->{h}; 562 glVertex 0 , $self->{h};
472 glEnd; 563 glEnd;
473 glDisable GL_BLEND; 564 glDisable GL_BLEND;
474 } 565 }
475 566
476 if ($ENV{PCLIENT_DEBUG}) { 567 if ($ENV{CFPLUS_DEBUG} & 1) {
477 glPushMatrix; 568 glPushMatrix;
478 glColor 1, 1, 0, 1; 569 glColor 1, 1, 0, 1;
479 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 570 glTranslate 0.375, 0.375;
480 glBegin GL_LINE_LOOP; 571 glBegin GL_LINE_LOOP;
481 glVertex 0 , 0; 572 glVertex 0 , 0;
482 glVertex $self->{w} - 1, 0; 573 glVertex $self->{w} - 1, 0;
483 glVertex $self->{w} - 1, $self->{h} - 1; 574 glVertex $self->{w} - 1, $self->{h} - 1;
484 glVertex 0 , $self->{h} - 1; 575 glVertex 0 , $self->{h} - 1;
485 glEnd; 576 glEnd;
486 glPopMatrix; 577 glPopMatrix;
487 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
488 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
489} 583}
490 584
491sub _draw { 585sub _draw {
492 my ($self) = @_; 586 my ($self) = @_;
493 587
494 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
495}
496
497sub find_widget {
498 my ($self, $x, $y) = @_;
499
500 return () unless $self->{can_events};
501
502 return $self
503 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
504 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
505
506 ()
507}
508
509sub set_parent {
510 my ($self, $parent) = @_;
511
512 Scalar::Util::weaken ($self->{parent} = $parent);
513
514 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
515
516 $self->check_size;
517}
518
519sub check_size {
520 my ($self, $forced) = @_;
521
522 $self->{force_alloc} = 1 if $forced;
523 $CFClient::UI::ROOT->{check_size}{$self} = $self;
524}
525
526sub update {
527 my ($self) = @_;
528
529 $self->{parent}->update
530 if $self->{parent};
531}
532
533sub connect {
534 my ($self, $signal, $cb) = @_;
535
536 push @{ $self->{signal_cb}{$signal} }, $cb;
537}
538
539sub _emit {
540 my ($self, $signal, @args) = @_;
541
542 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
543}
544
545sub emit {
546 my ($self, $signal, @args) = @_;
547
548 $self->_emit ($signal, @args)
549 || $self->$signal (@args);
550}
551
552sub visibility_change {
553 #my ($self, $visible) = @_;
554} 589}
555 590
556sub DESTROY { 591sub DESTROY {
557 my ($self) = @_; 592 my ($self) = @_;
558 593
590 625
591 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
592 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
593 628
594 glEnable GL_BLEND; 629 glEnable GL_BLEND;
595 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
596 glColor @$color; 631 glColor_premultiply @$color;
597 632
598 glBegin GL_QUADS; 633 glBegin GL_QUADS;
599 glVertex 0 , 0; 634 glVertex 0 , 0;
600 glVertex 0 , $h; 635 glVertex 0 , $h;
601 glVertex $w, $h; 636 glVertex $w, $h;
616 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
617 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
618} 653}
619 654
620sub size_request { 655sub size_request {
621 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
622} 659}
623 660
624sub draw { } 661sub draw { }
625 662
626############################################################################# 663#############################################################################
630our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
631 668
632sub new { 669sub new {
633 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
634 671
635 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
636 673
637 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
638 children => [], 675 children => [],
639 can_events => 0, 676 can_events => 0,
640 %arg, 677 %arg,
641 ); 678 );
679
642 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
643 682
644 $self 683 $self
645} 684}
646 685
647sub add { 686sub add {
655 $self->{children} = [ 694 $self->{children} = [
656 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
657 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
658 ]; 697 ];
659 698
660 $self->check_size (1); 699 $self->realloc;
661 $self->update;
662} 700}
663 701
664sub children { 702sub children {
665 @{ $_[0]{children} } 703 @{ $_[0]{children} }
666} 704}
671 delete $child->{parent}; 709 delete $child->{parent};
672 $child->hide; 710 $child->hide;
673 711
674 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
675 713
676 $self->check_size (1); 714 $self->realloc;
677 $self->update;
678} 715}
679 716
680sub clear { 717sub clear {
681 my ($self) = @_; 718 my ($self) = @_;
682 719
686 for (@$children) { 723 for (@$children) {
687 delete $_->{parent}; 724 delete $_->{parent};
688 $_->hide; 725 $_->hide;
689 } 726 }
690 727
691 $self->check_size; 728 $self->realloc;
692 $self->update;
693} 729}
694 730
695sub find_widget { 731sub find_widget {
696 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
697 733
698 $x -= $self->{x}; 734 $x -= $self->{x};
699 $y -= $self->{y}; 735 $y -= $self->{y};
700 736
701 my $res; 737 my $res;
702 738
703 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
705 and return $res; 741 and return $res;
706 } 742 }
707 743
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
757 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
758} 794}
759 795
760############################################################################# 796#############################################################################
761 797
798# back-buffered drawing area
799
762package CFClient::UI::Window; 800package CFClient::UI::Window;
763 801
764our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
765 803
766use CFClient::OpenGL; 804use CFClient::OpenGL;
784 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
785 $self->update; 823 $self->update;
786} 824}
787 825
788sub _render { 826sub _render {
827 my ($self) = @_;
828
789 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
790} 830}
791 831
792sub render_child { 832sub render_child {
793 my ($self) = @_; 833 my ($self) = @_;
794 834
795 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
796 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
797 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
798 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
799 $self->_render; 846 $self->_render;
800 }; 847 };
801} 848}
802 849
803sub _draw { 850sub _draw {
804 my ($self) = @_; 851 my ($self) = @_;
805 852
806 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
807 854
808 my $tex = $self->{texture} 855 my $tex = $self->{texture}
809 or return; 856 or return;
810 857
811 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
812 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
813 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
814 863
815 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
816 865
866 glDisable GL_BLEND;
817 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
818} 868}
819 869
820############################################################################# 870#############################################################################
821 871
834} 884}
835 885
836sub size_request { 886sub size_request {
837 my ($self) = @_; 887 my ($self) = @_;
838 888
839 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
840 890
841 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
842 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
843 893
844 ($w, $h) 894 ($w, $h)
845} 895}
846 896
847sub size_allocate { 897sub size_allocate {
848 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
849 899
900 my $child = $self->child;
901
850 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
851 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
852 904
853 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
854 $self->update; 906 $self->update;
855} 907}
856 908
892} 944}
893 945
894sub _render { 946sub _render {
895 my ($self) = @_; 947 my ($self) = @_;
896 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
897 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
898 953
899 $self->SUPER::_render; 954 $self->SUPER::_render;
900} 955}
901 956
904package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
905 960
906our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
907 962
908sub new { 963sub new {
909 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
910 967
911 my $self; 968 my $self;
912 969
913 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
914 vertical => 1, 971 vertical => 1,
919 ; 976 ;
920 977
921 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
922 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
923 slider => $slider, 980 slider => $slider,
924 @_, 981 %arg,
925 ); 982 );
926 983
927 $self->{vp}->add ($self->{scrolled});
928 $self->add ($self->{vp});
929 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
930 986
931 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
932} 994}
933 995
934sub update { 996sub update {
935 my ($self) = @_; 997 my ($self) = @_;
936 998
975 1037
976 if ($self->{bg}) { 1038 if ($self->{bg}) {
977 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
978 1040
979 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
981 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
982 1044
983 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
984 glVertex 0 , 0; 1046 glVertex 0 , 0;
985 glVertex 0 , $h; 1047 glVertex 0 , $h;
986 glVertex $w, $h; 1048 glVertex $w, $h;
999 1061
1000our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1001 1063
1002use CFClient::OpenGL; 1064use CFClient::OpenGL;
1003 1065
1004my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1005 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1006 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1007 1073
1008sub new { 1074sub new {
1009 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1010 1078
1011 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1012 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1013 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1014 border => 0.6, 1082 border => 0.6,
1015 is_toplevel => 1,
1016 can_events => 1, 1083 can_events => 1,
1017 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1018 ); 1087 );
1019 1088
1020 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1021 align => 0, 1090 align => 0,
1022 valign => 1, 1091 valign => 1,
1023 text => $self->{title}, 1092 text => $title,
1024 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1025 1095
1026 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1027} 1104}
1028 1105
1029sub border { 1106sub border {
1030 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1031} 1108}
1032 1109
1033sub size_request { 1110sub size_request {
1034 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1035 1115
1036 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1037 1117
1038 ( 1118 (
1039 $w + $self->border * 2, 1119 $w + $self->border * 2,
1042} 1122}
1043 1123
1044sub size_allocate { 1124sub size_allocate {
1045 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1046 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1047 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1048 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1049 1137
1050 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1051 if $self->{title};
1052
1053 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1054} 1139}
1055 1140
1056sub button_down { 1141sub button_down {
1057 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1058 1143
1074 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1075 1160
1076 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1077 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1078 1163
1079 $self->{user_x} = $wx + $dx * $mx;
1080 $self->{user_y} = $wy + $dy * $my;
1081 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1082 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1083 $self->move ($self->{user_x}, $self->{user_y}); 1166
1084 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1085 }; 1169 };
1086 1170
1087 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1088 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1089 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
1091 $self->{motion} = sub { 1175 $self->{motion} = sub {
1092 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1093 1177
1094 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1095 1179
1096 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1097 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1098 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1099 $self->move ($self->{user_x}, $self->{user_y});
1100 $self->update;
1101 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1102 } 1188 1
1103} 1189}
1104 1190
1105sub button_up { 1191sub button_up {
1106 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1107 1193
1108 delete $self->{motion}; 1194 !!delete $self->{motion}
1109} 1195}
1110 1196
1111sub mouse_motion { 1197sub mouse_motion {
1112 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1113 1199
1114 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1115} 1203}
1116 1204
1117sub _draw { 1205sub _draw {
1118 my ($self) = @_; 1206 my ($self) = @_;
1119 1207
1208 my $child = $self->{children}[0];
1209
1120 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1121 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1122 1212
1123 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1124 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1125 1215
1126 my $border = $self->border; 1216 my $border = $self->border;
1127 1217
1128 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1129 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1130 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1131 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1132 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1133 1223
1134 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1135 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1136 1226
1137 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1138 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1139 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1140
1141 glColor @{ $self->{bg} };
1142
1143 $bg->{s} = $rep_x;
1144 $bg->{t} = $rep_y;
1145 $bg->{wrap_mode} = 1;
1146 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1147 } 1232 }
1148 1233
1149 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1150 1235
1151 $self->{title}->draw if $self->{title};
1152
1153 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1154} 1242}
1155 1243
1156############################################################################# 1244#############################################################################
1157 1245
1158package CFClient::UI::Table; 1246package CFClient::UI::Table;
1180 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1181 1269
1182 $child->set_parent ($self); 1270 $child->set_parent ($self);
1183 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1184 1272
1185 $self->check_size (1); 1273 $self->realloc;
1186} 1274}
1187 1275
1188# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1189sub clear { 1277sub clear {
1190 my ($self) = @_; 1278 my ($self) = @_;
1195 for (@children) { 1283 for (@children) {
1196 delete $_->{parent}; 1284 delete $_->{parent};
1197 $_->hide; 1285 $_->hide;
1198 } 1286 }
1199 1287
1200 $self->check_size (1); 1288 $self->realloc;
1201 $self->update;
1202} 1289}
1203 1290
1204sub get_wh { 1291sub get_wh {
1205 my ($self) = @_; 1292 my ($self) = @_;
1206 1293
1414 ellipsise => 3, # end 1501 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1416 fontsize => 1, 1503 fontsize => 1,
1417 align => -1, 1504 align => -1,
1418 valign => -1, 1505 valign => -1,
1419 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1420 can_events => 0, 1508 can_events => 0,
1421 %arg 1509 %arg
1422 ); 1510 );
1423 1511
1424 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
1460 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1461 1549
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1464 1552
1553 $self->realloc;
1465 $self->update; 1554 $self->update;
1466 $self->check_size;
1467} 1555}
1468 1556
1469sub set_markup { 1557sub set_markup {
1470 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1471 1559
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1564
1477 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1478 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1479 1567
1568 $self->realloc;
1480 $self->update; 1569 $self->update;
1481 $self->check_size;
1482} 1570}
1483 1571
1484sub size_request { 1572sub size_request {
1485 my ($self) = @_; 1573 my ($self) = @_;
1486 1574
1500 1588
1501 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1503 } 1591 }
1504 1592
1505 ( 1593 ($w, $h)
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1594}
1510 1595
1511sub size_allocate { 1596sub size_allocate {
1512 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1513 1598
1599 delete $self->{ox};
1600
1514 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1603}
1516 1604
1517sub set_fontsize { 1605sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1519 1607
1520 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1609 delete $self->{texture};
1522 1610
1523 $self->update; 1611 $self->realloc;
1524 $self->check_size;
1525} 1612}
1526 1613
1527sub _draw { 1614sub _draw {
1528 my ($self) = @_; 1615 my ($self) = @_;
1529 1616
1535 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1626
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1541 1629
1630 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1545 1634
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1638 };
1552 1639
1553 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1554 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1555 1642
1593 1680
1594 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1595 1682
1596 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1597 1684
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1686 $self->{text} = $text;
1602 1687
1603 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1605 1690
1606 $self->_emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1607} 1693}
1608 1694
1609sub set_text { 1695sub set_text {
1610 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1611 1697
1612 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1699 $self->_set_text ($text);
1614 $self->update; 1700
1615 $self->check_size; 1701 $self->realloc;
1616} 1702}
1617 1703
1618sub get_text { 1704sub get_text {
1619 $_[0]{text} 1705 $_[0]{text}
1620} 1706}
1650 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1738 $self->_emit ('escape');
1653 } elsif ($uni) { 1739 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1655 } 1743 }
1656 1744
1657 $self->_set_text ($text); 1745 $self->_set_text ($text);
1658 $self->update; 1746
1659 $self->check_size; 1747 $self->realloc;
1748
1749 1
1660} 1750}
1661 1751
1662sub focus_in { 1752sub focus_in {
1663 my ($self) = @_; 1753 my ($self) = @_;
1664 1754
1679 utf8::encode $text; 1769 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1681 1771
1682 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1683 $self->update; 1773 $self->update;
1774
1775 1
1684} 1776}
1685 1777
1686sub mouse_motion { 1778sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1688# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1689} 1783}
1690 1784
1691sub _draw { 1785sub _draw {
1692 my ($self) = @_; 1786 my ($self) = @_;
1693 1787
1694 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1695 1789
1696 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1699 } else { 1793 } else {
1700 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1701 } 1795 }
1702 1796
1703 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1800 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
1770 } else { 1864 } else {
1771 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1772 } 1866 }
1773 1867
1774 } else { 1868 } else {
1775 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1776 } 1872 1
1777
1778} 1873}
1779 1874
1780############################################################################# 1875#############################################################################
1781 1876
1782package CFClient::UI::Button; 1877package CFClient::UI::Button;
1791 1886
1792sub new { 1887sub new {
1793 my $class = shift; 1888 my $class = shift;
1794 1889
1795 $class->SUPER::new ( 1890 $class->SUPER::new (
1796 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1797 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1799 can_hover => 1, 1895 can_hover => 1,
1800 align => 0, 1896 align => 0,
1801 valign => 0, 1897 valign => 0,
1810 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1811 1907
1812 $self->emit ("activate") 1908 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1910 && $y >= 0 && $y < $self->{h};
1911
1912 1
1815} 1913}
1816 1914
1817sub _draw { 1915sub _draw {
1818 my ($self) = @_; 1916 my ($self) = @_;
1819 1917
1848 1946
1849sub new { 1947sub new {
1850 my $class = shift; 1948 my $class = shift;
1851 1949
1852 $class->SUPER::new ( 1950 $class->SUPER::new (
1853 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1854 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1957 state => 0,
1862} 1961}
1863 1962
1864sub size_request { 1963sub size_request {
1865 my ($self) = @_; 1964 my ($self) = @_;
1866 1965
1867 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1868} 1967}
1869 1968
1870sub button_down { 1969sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1872 1971
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1877 } 1980 1
1878} 1981}
1879 1982
1880sub _draw { 1983sub _draw {
1881 my ($self) = @_; 1984 my ($self) = @_;
1882 1985
1883 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1884 1987
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 1989
1887 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1888 1993
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 1995
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 1997
2047 2152
2048 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
2050 2155
2051 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
2052 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2053 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2161
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
2157 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2164 vertical => 0, 2270 vertical => 0,
2165 can_hover => 1, 2271 can_hover => 1,
2166 inner_pad => 0.02, 2272 inner_pad => 0.02,
2167 @_ 2273 @_
2168 ); 2274 );
2171 $self->update; 2277 $self->update;
2172 2278
2173 $self 2279 $self
2174} 2280}
2175 2281
2282sub changed { }
2283
2176sub set_range { 2284sub set_range {
2177 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2178 2286
2179 ($range, $self->{range}) = ($self->{range}, $range); 2287 ($range, $self->{range}) = ($self->{range}, $range);
2180 2288
2206} 2314}
2207 2315
2208sub size_request { 2316sub size_request {
2209 my ($self) = @_; 2317 my ($self) = @_;
2210 2318
2211 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2320}
2216 2321
2217sub button_down { 2322sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2219 2324
2220 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2221 2326
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2328
2224 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2225} 2330}
2226 2331
2227sub mouse_motion { 2332sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2229 2334
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2339
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2341
2237 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2238 } 2347 1
2239} 2348}
2240 2349
2241sub update { 2350sub update {
2242 my ($self) = @_; 2351 my ($self) = @_;
2243 2352
2244 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2245 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2246 2362
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2249 2365
2255 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2257 2373
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2260 }); 2376 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2377
2268 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2269 2379
2270 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2271 2381
2604} 2714}
2605 2715
2606sub set_tooltip_from { 2716sub set_tooltip_from {
2607 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2608 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2609 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2610 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2611 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2612 fontsize => 0.8, 2731 fontsize => 0.8,
2613 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2614 ellipsise => 0, 2733 ellipsise => 0,
2615 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
2626 2745
2627sub size_allocate { 2746sub size_allocate {
2628 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2629 2748
2630 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2631} 2768}
2632 2769
2633sub _draw { 2770sub _draw {
2634 my ($self) = @_; 2771 my ($self) = @_;
2635 2772
2652 glVertex $w, $h; 2789 glVertex $w, $h;
2653 glVertex $w, 0; 2790 glVertex $w, 0;
2654 glEnd; 2791 glEnd;
2655 2792
2656 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2657 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2658} 2796}
2659 2797
2660############################################################################# 2798#############################################################################
2661 2799
2737 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2738} 2876}
2739 2877
2740############################################################################# 2878#############################################################################
2741 2879
2742package CFClient::UI::Inventory; 2880package CFClient::UI::Buttonbar;
2743 2881
2744our @ISA = CFClient::UI::ScrolledWindow::; 2882our @ISA = CFClient::UI::HBox::;
2745 2883
2746sub new { 2884# TODO: should actualyl wrap buttons and other goodies.
2747 my $class = shift;
2748
2749 my $self = $class->SUPER::new (
2750 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2751 @_,
2752 );
2753
2754 $self
2755}
2756
2757sub set_items {
2758 my ($self, $items) = @_;
2759
2760 $self->{scrolled}->clear;
2761 return unless $items;
2762
2763 my @items = sort {
2764 ($a->{type} <=> $b->{type})
2765 or ($a->{name} cmp $b->{name})
2766 } @$items;
2767
2768 $self->{real_items} = \@items;
2769
2770 my $row = 0;
2771 for my $item (@items) {
2772 CFClient::Item::update_widgets $item;
2773
2774 $self->{scrolled}->add (0, $row, $item->{face_widget});
2775 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2776 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2777
2778 $row++;
2779 }
2780}
2781 2885
2782############################################################################# 2886#############################################################################
2783 2887
2784package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2785 2889
2826 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2827 $GRAB = $self; 2931 $GRAB = $self;
2828 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2829 2933
2830 $self->show; 2934 $self->show;
2831 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2832} 2936}
2833 2937
2834sub mouse_motion { 2938sub mouse_motion {
2835 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2836 2940
2837 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2838 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2839 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2840} 2946}
2841 2947
2842sub button_up { 2948sub button_up {
2843 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2844 2950
2846 undef $GRAB; 2952 undef $GRAB;
2847 $self->hide; 2953 $self->hide;
2848 2954
2849 $self->_emit ("popdown"); 2955 $self->_emit ("popdown");
2850 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2851 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2852} 3070}
2853 3071
2854############################################################################# 3072#############################################################################
2855 3073
2856package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
2961 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
2962} 3180}
2963 3181
2964############################################################################# 3182#############################################################################
2965 3183
2966package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
2967 3185
2968our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
2969
2970use CFClient::OpenGL;
2971 3187
2972sub new { 3188sub new {
2973 my $class = shift; 3189 my $class = shift;
2974 3190
2975 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3433 @_,
3434 )
3435}
3436
3437# XXX: Do sorting? Argl...
3438sub add_spell {
3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3441
3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
2976 visible => 1, 3489 visible => 1,
2977 @_, 3490 @_,
2978 ) 3491 );
2979}
2980 3492
2981sub configure { 3493 Scalar::Util::weaken ($self->{root} = $self);
2982 my ($self, $x, $y, $w, $h) = @_;
2983 3494
2984 $self->{w} = $w; 3495 $self
2985 $self->{h} = $h;
2986}
2987
2988sub check_size {
2989 my ($self) = @_;
2990
2991 $self->size_allocate ($self->{w}, $self->{h})
2992 if $self->{w};
2993} 3496}
2994 3497
2995sub size_request { 3498sub size_request {
2996 my ($self) = @_; 3499 my ($self) = @_;
2997 3500
2998 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
2999} 3516}
3000 3517
3001sub size_allocate { 3518sub size_allocate {
3002 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3003 3520
3004 for my $child ($self->children) { 3521 for my $child ($self->children) {
3005 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3006 3523
3007 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3008 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3009 3526
3010 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3011 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3012
3013 delete @$child{qw(req_x req_y)};
3014
3015 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3016 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3017 3529
3018 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3019 } 3531 }
3020} 3532}
3021 3533
3032} 3544}
3033 3545
3034sub update { 3546sub update {
3035 my ($self) = @_; 3547 my ($self) = @_;
3036 3548
3037 $self->check_size;
3038 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3039} 3550}
3040 3551
3041sub add { 3552sub add {
3042 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3043 3554
3044 for my $child (@children) {
3045 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3046 3556 for @children;
3047 # integerise window positions
3048 $child->{x} = int $child->{x};
3049 $child->{y} = int $child->{y};
3050 }
3051 3557
3052 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3053
3054 for (my @widgets = @children; my $w = pop @widgets; ) {
3055 push @widgets, $w->children;
3056 $w->set_visible;
3057 }
3058
3059} 3559}
3060 3560
3061sub remove { 3561sub remove {
3062 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3063 3563
3064 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3065 3568
3066 while (@children) { 3569 while (@children) {
3067 my $w = pop @children; 3570 my $w = pop @children;
3068 push @children, $w->children; 3571 push @children, $w->children;
3069 $w->set_invisible; 3572 $w->set_invisible;
3088 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3089 $_->() 3592 $_->()
3090 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3091 } 3594 }
3092 3595
3093 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3597 my %queue;
3094 my @queue; 3598 my @queue;
3599 my $widget;
3095 3600
3096 for (;;) { 3601 outer:
3097 if ($self->{check_size}) { 3602 while () {
3098 #TODO use array-of-depth approach 3603 if (my $realloc = delete $self->{realloc}) {
3604 for $widget (values %$realloc) {
3605 $widget->{visible} or next; # do not resize invisible widgets
3099 3606
3100 @queue = sort { $a->{visible} <=> $b->{visible} } 3607 $queue{$widget+0}++ and next; # duplicates are common
3101 @queue, values %{delete $self->{check_size}}; 3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3102 } 3611 }
3103 3612
3613 while () {
3614 @queue or last outer;
3615
3104 my $widget = pop @queue || last; 3616 $widget = pop @{ $queue[-1] || [] }
3105 3617 and last;
3106 defined $widget->{visible} or last; # do not resize invisible widgets
3107
3108 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3109 ? @$widget{qw(def_w def_h)}
3110 : $widget->size_request;
3111
3112 if (delete $widget->{force_alloc}
3113 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3114 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3115 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3116 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3117 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3118 3636
3119 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3120 3638
3121 $widget->{parent}->check_size
3122 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3123 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3124 } 3649 }
3125 } 3650 }
3126 3651
3127 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3128 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3129 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3130 3660
3131 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3132 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3133 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3134 $widget->{w} = $w; 3671 $widget->{w} = $w;
3135 $widget->{h} = $h; 3672 $widget->{h} = $h;
3673
3136 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3137 } 3676 }
3138 } 3677 }
3139 3678
3140 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3141 $_->() 3680 $_->()
3142 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3143 } 3682 }
3683
3144 3684
3145 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3146 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3147 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3148 3688
3150 glLoadIdentity; 3690 glLoadIdentity;
3151 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3152 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3153 glLoadIdentity; 3693 glLoadIdentity;
3154 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3155 $self->_draw; 3702 $self->_draw;
3156} 3703}
3157 3704
3158############################################################################# 3705#############################################################################
3159 3706

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines