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.236 by root, Thu May 25 16:54:29 2006 UTC vs.
Revision 1.282 by root, Mon Jun 5 02:25:10 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
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
322} 390}
323 391
324sub set_tooltip { 392sub set_tooltip {
325 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
326 394
… …
378 446
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 447 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 448 unless $FOCUS;
381} 449}
382 450
383sub mouse_motion { } 451sub mouse_motion { 0 }
384sub button_up { } 452sub button_up { 0 }
385sub key_down { } 453sub key_down { 0 }
386sub key_up { } 454sub key_up { 0 }
387 455
388sub button_down { 456sub button_down {
389 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
390 458
391 $self->focus_in; 459 $self->focus_in;
392}
393 460
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 465 my ($self, $x, $y) = @_;
466
467 return () unless $self->{can_events};
468
469 return $self
470 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
471 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
472
473 ()
474}
475
476sub set_parent {
477 my ($self, $parent) = @_;
478
479 Scalar::Util::weaken ($self->{parent} = $parent);
480 $self->set_visible if $parent->{visible};
481}
482
483sub connect {
484 my ($self, $signal, $cb) = @_;
485
486 push @{ $self->{signal_cb}{$signal} }, $cb;
487}
488
489sub _emit {
490 my ($self, $signal, @args) = @_;
491
492 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
493}
494
495sub emit {
496 my ($self, $signal, @args) = @_;
497
498 $self->_emit ($signal, @args)
499 || $self->$signal (@args);
500}
501
502sub visibility_change {
503 #my ($self, $visible) = @_;
504}
505
506sub realloc {
507 my ($self) = @_;
508
509 if ($self->{visible}) {
510 return if $self->{root}{realloc}{$self+0};
511
512 $self->{root}{realloc}{$self+0} = $self;
513 $self->{root}->update;
514 } else {
515 delete $self->{req_w};
516 delete $self->{req_h};
517 }
518}
519
520sub update {
521 my ($self) = @_;
522
523 $self->{parent}->update
524 if $self->{parent};
525}
526
527sub reconfigure {
528 my ($self) = @_;
529
530 $self->realloc;
531 $self->update;
532}
533
534# using global variables seems a bit hacky, but passing through all drawing
535# functions seems pointless.
536our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 537
400sub draw { 538sub draw {
401 my ($self) = @_; 539 my ($self) = @_;
402 540
403 return unless $self->{h} && $self->{w}; 541 return unless $self->{h} && $self->{w};
542
543 # update screen rectangle
544 local $draw_x = $draw_x + $self->{x};
545 local $draw_y = $draw_y + $self->{y};
546 local $draw_w = $draw_x + $self->{w};
547 local $draw_h = $draw_y + $self->{h};
548
549 # skip widgets that are entirely outside the drawing area
550 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
551 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 552
405 glPushMatrix; 553 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 555
410 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 558 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 560 glBegin GL_QUADS;
417 glVertex $x , $y; 561 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 562 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 563 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 564 glVertex 0 , $self->{h};
421 glEnd; 565 glEnd;
422 glDisable GL_BLEND; 566 glDisable GL_BLEND;
423 } 567 }
424 568
425 if ($ENV{PCLIENT_DEBUG}) { 569 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 570 glPushMatrix;
427 glColor 1, 1, 0, 1; 571 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 572 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 573 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 574 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 575 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 576 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 577 glVertex 0 , $self->{h} - 1;
434 glEnd; 578 glEnd;
435 glPopMatrix; 579 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 580 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
438} 585}
439 586
440sub _draw { 587sub _draw {
441 my ($self) = @_; 588 my ($self) = @_;
442 589
443 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501} 591}
502 592
503sub DESTROY { 593sub DESTROY {
504 my ($self) = @_; 594 my ($self) = @_;
505 595
… …
537 627
538 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
540 630
541 glEnable GL_BLEND; 631 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 633 glColor_premultiply @$color;
544 634
545 glBegin GL_QUADS; 635 glBegin GL_QUADS;
546 glVertex 0 , 0; 636 glVertex 0 , 0;
547 glVertex 0 , $h; 637 glVertex 0 , $h;
548 glVertex $w, $h; 638 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
565} 655}
566 656
567sub size_request { 657sub size_request {
568 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
569} 661}
570 662
571sub draw { } 663sub draw { }
572 664
573############################################################################# 665#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
578 670
579sub new { 671sub new {
580 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
581 673
582 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
583 675
584 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
585 children => [], 677 children => [],
586 can_events => 0, 678 can_events => 0,
587 %arg, 679 %arg,
588 ); 680 );
681
589 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
590 684
591 $self 685 $self
592} 686}
593 687
594sub add { 688sub add {
… …
602 $self->{children} = [ 696 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
605 ]; 699 ];
606 700
607 $self->check_size (1); 701 $self->realloc;
608 $self->update;
609} 702}
610 703
611sub children { 704sub children {
612 @{ $_[0]{children} } 705 @{ $_[0]{children} }
613} 706}
… …
618 delete $child->{parent}; 711 delete $child->{parent};
619 $child->hide; 712 $child->hide;
620 713
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 715
623 $self->check_size (1); 716 $self->realloc;
624 $self->update;
625} 717}
626 718
627sub clear { 719sub clear {
628 my ($self) = @_; 720 my ($self) = @_;
629 721
… …
633 for (@$children) { 725 for (@$children) {
634 delete $_->{parent}; 726 delete $_->{parent};
635 $_->hide; 727 $_->hide;
636 } 728 }
637 729
638 $self->check_size; 730 $self->realloc;
639 $self->update;
640} 731}
641 732
642sub find_widget { 733sub find_widget {
643 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
644 735
645 $x -= $self->{x}; 736 $x -= $self->{x};
646 $y -= $self->{y}; 737 $y -= $self->{y};
647 738
648 my $res; 739 my $res;
649 740
650 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
652 and return $res; 743 and return $res;
653 } 744 }
654 745
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
704 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
705} 796}
706 797
707############################################################################# 798#############################################################################
708 799
800# back-buffered drawing area
801
709package CFClient::UI::Window; 802package CFClient::UI::Window;
710 803
711our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
712 805
713use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
731 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 825 $self->update;
733} 826}
734 827
735sub _render { 828sub _render {
829 my ($self) = @_;
830
736 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
737} 832}
738 833
739sub render_child { 834sub render_child {
740 my ($self) = @_; 835 my ($self) = @_;
741 836
742 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 837 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
743 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
745 840
841 {
842 package CFClient::UI::Base;
843
844 ($draw_x, $draw_y, $draw_w, $draw_h) =
845 (0, 0, $self->{w}, $self->{h});
846 }
847
746 $self->_render; 848 $self->_render;
747 }; 849 };
748} 850}
749 851
750sub _draw { 852sub _draw {
751 my ($self) = @_; 853 my ($self) = @_;
752 854
753 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
754 856
755 my $tex = $self->{texture} 857 my $tex = $self->{texture}
756 or return; 858 or return;
757 859
758 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
761 863
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 865
764 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
765} 867}
… …
781} 883}
782 884
783sub size_request { 885sub size_request {
784 my ($self) = @_; 886 my ($self) = @_;
785 887
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 889
788 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
789} 894}
790 895
791sub size_allocate { 896sub size_allocate {
792 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
793 898
899 my $child = $self->child;
900
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 903
797 $self->child->configure (0, 0, $w, $h); 904 $self->child->configure (0, 0, $w, $h);
798 $self->update; 905 $self->update;
799} 906}
800 907
… …
836} 943}
837 944
838sub _render { 945sub _render {
839 my ($self) = @_; 946 my ($self) = @_;
840 947
948 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
949 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
950
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 952
843 $self->SUPER::_render; 953 $self->SUPER::_render;
844} 954}
845 955
… …
848package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
849 959
850our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
851 961
852sub new { 962sub new {
853 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
854 966
855 my $self; 967 my $self;
856 968
857 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
858 vertical => 1, 970 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 972 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
862 }, 974 },
863 ; 975 ;
864 976
865 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 979 slider => $slider,
868 @_, 980 %arg,
869 ); 981 );
870 982
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
874 985
875 $self 986 $self
987}
988
989sub add {
990 my ($self, $widget) = @_;
991
992 $self->{vp}->add ($self->{child} = $widget);
993}
994
995sub update {
996 my ($self) = @_;
997
998 $self->SUPER::update;
999
1000 # todo: overwrite size_allocate of child
1001 my $child = $self->{vp}->child;
1002 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 1003}
877 1004
878sub size_allocate { 1005sub size_allocate {
879 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
880 1007
… …
909 1036
910 if ($self->{bg}) { 1037 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
912 1039
913 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
916 1043
917 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
918 glVertex 0 , 0; 1045 glVertex 0 , 0;
919 glVertex 0 , $h; 1046 glVertex 0 , $h;
920 glVertex $w, $h; 1047 glVertex $w, $h;
… …
933 1060
934our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
935 1062
936use CFClient::OpenGL; 1063use CFClient::OpenGL;
937 1064
938my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1071 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1072
942sub new { 1073sub new {
943 my $class = shift; 1074 my ($class, %arg) = @_;
944 1075
945 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
946 1077
947 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1081 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1082 can_events => 1,
953 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
954 ); 1086 );
955 1087
956 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
957 align => 0, 1089 align => 0,
958 valign => 1, 1090 valign => 1,
959 text => $self->{title}, 1091 text => $title,
960 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
961 1094
962 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
963} 1103}
964 1104
965sub border { 1105sub border {
966 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
967} 1107}
968 1108
969sub size_request { 1109sub size_request {
970 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
971 1114
972 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
973 1116
974 ( 1117 (
975 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
978} 1121}
979 1122
980sub size_allocate { 1123sub size_allocate {
981 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
982 1125
1126 if ($self->{title}) {
1127 $self->{title}{w} = $w;
1128 $self->{title}{h} = $h;
1129 $self->{title}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
983 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
985 1136
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
990} 1138}
991 1139
992sub button_down { 1140sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
994 1142
… …
1010 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1011 1159
1012 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1014 1162
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1167 $self->realloc;
1019 }; 1168 };
1020 1169
1021 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1174 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1027 1176
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1178
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1033 } 1187 1
1034} 1188}
1035 1189
1036sub button_up { 1190sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1038 1192
1039 delete $self->{motion}; 1193 !!delete $self->{motion}
1040} 1194}
1041 1195
1042sub mouse_motion { 1196sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1044 1198
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1046} 1202}
1047 1203
1048sub _draw { 1204sub _draw {
1049 my ($self) = @_; 1205 my ($self) = @_;
1050 1206
1207 my $child = $self->{children}[0];
1208
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1211
1054 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1214
1057 my $border = $self->border; 1215 my $border = $self->border;
1058 1216
1059 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1222
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1067 1225
1068 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1231 }
1079 1232
1080 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1081 1234
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1085} 1241}
1086 1242
1087############################################################################# 1243#############################################################################
1088 1244
1089package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1111 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1112 1268
1113 $child->set_parent ($self); 1269 $child->set_parent ($self);
1114 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1115 1271
1116 $self->check_size (1); 1272 $self->realloc;
1117} 1273}
1118 1274
1119# TODO: move to container class maybe? send children a signal on removal? 1275# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1276sub clear {
1121 my ($self) = @_; 1277 my ($self) = @_;
… …
1126 for (@children) { 1282 for (@children) {
1127 delete $_->{parent}; 1283 delete $_->{parent};
1128 $_->hide; 1284 $_->hide;
1129 } 1285 }
1130 1286
1131 $self->check_size (1); 1287 $self->realloc;
1132 $self->update;
1133} 1288}
1134 1289
1135sub get_wh { 1290sub get_wh {
1136 my ($self) = @_; 1291 my ($self) = @_;
1137 1292
… …
1168sub size_allocate { 1323sub size_allocate {
1169 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1170 1325
1171 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1172 1327
1173 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1174 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1175 1330
1176 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1177 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1178 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1179 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1233 } 1388 }
1234} 1389}
1235 1390
1236############################################################################# 1391#############################################################################
1237 1392
1238package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1239
1240# TODO: wrap into common Box base class
1241 1394
1242our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1243 1396
1244sub size_request { 1397sub size_request {
1245 my ($self) = @_; 1398 my ($self) = @_;
1246 1399
1247 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1248 1401 ? (
1249 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1250 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1251 (List::Util::max map $_->[1], @alloc), 1404 )
1252 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1253} 1409}
1254 1410
1255sub size_allocate { 1411sub size_allocate {
1256 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1257 1413
1258 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1259
1260 my $children = $self->{children}; 1415 my $children = $self->{children};
1261 1416
1262 my @h = map $_->{req_w}, @$children; 1417 my @req;
1263 1418
1264 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1265 1420 @req = ($space / (@$children || 1)) x @$children;
1266 if ($req_h > $h) {
1267 # ah well, not enough space
1268 $_ *= $h / $req_h for @h;
1269 } else { 1421 } else {
1422 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1423 my $req = List::Util::sum @req;
1424
1425 if ($req > $space) {
1426 # ah well, not enough space
1427 $_ *= $space / $req for @req;
1428 } else {
1270 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1271 $exp ||= 1;
1272 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1273 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1274 my $child = $children->[$_];
1275
1276 my $alloc_h = $h[$_];
1277 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1278 $h[$_] = $alloc_h;
1279 } 1435 }
1280 } 1436 }
1281 1437
1282 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1283 1439
1284 my $y = 0; 1440 my $pos = 0;
1285 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1286 my $child = $children->[$_];
1287 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1288 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1289 1444
1290 $y += $h; 1445 $pos += $alloc;
1291 } 1446 }
1292 1447
1293 1 1448 1
1294} 1449}
1295 1450
1296############################################################################# 1451#############################################################################
1297 1452
1453package CFClient::UI::HBox;
1454
1455our @ISA = CFClient::UI::Box::;
1456
1457sub new {
1458 my $class = shift;
1459
1460 $class->SUPER::new (
1461 vertical => 0,
1462 @_,
1463 )
1464}
1465
1466#############################################################################
1467
1298package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1299 1469
1300# TODO: wrap into common Box base class
1301
1302our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1303 1471
1304sub size_request { 1472sub new {
1305 my ($self) = @_; 1473 my $class = shift;
1306 1474
1307 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1308 1476 vertical => 1,
1309 ( 1477 @_,
1310 (List::Util::max map $_->[0], @alloc),
1311 (List::Util::sum map $_->[1], @alloc),
1312 ) 1478 )
1313}
1314
1315sub size_allocate {
1316 my ($self, $w, $h) = @_;
1317
1318 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1319
1320 my $children = $self->{children};
1321
1322 my @h = map $_->{req_h}, @$children;
1323
1324 my $req_h = List::Util::sum @h;
1325
1326 if ($req_h > $h) {
1327 # ah well, not enough space
1328 $_ *= $h / $req_h for @h;
1329 } else {
1330 my $exp = List::Util::sum map $_->{expand}, @$children;
1331 $exp ||= 1;
1332
1333 for (0 .. $#$children) {
1334 my $child = $children->[$_];
1335
1336 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1337 }
1338 }
1339
1340 CFClient::UI::harmonize \@h;
1341
1342 my $y = 0;
1343 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_];
1346 $child->configure (0, $y, $w, $h);
1347
1348 $y += $h;
1349 }
1350
1351 1
1352} 1479}
1353 1480
1354############################################################################# 1481#############################################################################
1355 1482
1356package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1373 ellipsise => 3, # end 1500 ellipsise => 3, # end
1374 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1375 fontsize => 1, 1502 fontsize => 1,
1376 align => -1, 1503 align => -1,
1377 valign => -1, 1504 valign => -1,
1378 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1379 can_events => 0, 1507 can_events => 0,
1380 %arg 1508 %arg
1381 ); 1509 );
1382 1510
1383 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1410 1538
1411 delete $self->{texture}; 1539 delete $self->{texture};
1412 $self->SUPER::update; 1540 $self->SUPER::update;
1413} 1541}
1414 1542
1543sub realloc {
1544 my ($self) = @_;
1545
1546 delete $self->{ox};
1547 delete $self->{req_h};
1548 $self->SUPER::realloc;
1549}
1550
1415sub set_text { 1551sub set_text {
1416 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1417 1553
1418 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1419 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1420 1556
1421 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1422 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1423 1559
1560 $self->realloc;
1424 $self->update; 1561 $self->update;
1425 $self->check_size;
1426} 1562}
1427 1563
1428sub set_markup { 1564sub set_markup {
1429 my ($self, $markup) = @_; 1565 my ($self, $markup) = @_;
1430 1566
… …
1434 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1570 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1435 1571
1436 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1572 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1437 $self->{layout}->set_markup ($markup); 1573 $self->{layout}->set_markup ($markup);
1438 1574
1575 $self->realloc;
1439 $self->update; 1576 $self->update;
1440 $self->check_size;
1441} 1577}
1442 1578
1443sub size_request { 1579sub size_request {
1444 my ($self) = @_; 1580 my ($self) = @_;
1445 1581
1582 if (exists $self->{req_h}) {
1583 @$self{qw(req_w req_h)}
1584 } else {
1446 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1447 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1448 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1449 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1450 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1451 1590
1452 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1453 1592
1454 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1455 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1456 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1457 1596
1458 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1459 1598
1460 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1461 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1462 } 1601 }
1463 1602
1603 ($w, $h)
1464 ( 1604 }
1465 $w + $self->{padding} * 2,
1466 $h + $self->{padding} * 2,
1467 )
1468} 1605}
1469 1606
1470sub size_allocate { 1607sub size_allocate {
1471 my ($self, $w, $h) = @_; 1608 my ($self, $w, $h) = @_;
1472 1609
1610 delete $self->{ox};
1611
1473 delete $self->{texture}; 1612 delete $self->{texture}
1613 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1474} 1614}
1475 1615
1476sub set_fontsize { 1616sub set_fontsize {
1477 my ($self, $fontsize) = @_; 1617 my ($self, $fontsize) = @_;
1478 1618
1479 $self->{fontsize} = $fontsize; 1619 $self->{fontsize} = $fontsize;
1480 delete $self->{texture}; 1620 delete $self->{texture};
1481 1621
1482 $self->update; 1622 $self->realloc;
1483 $self->check_size;
1484} 1623}
1485 1624
1486sub _draw { 1625sub _draw {
1487 my ($self) = @_; 1626 my ($self) = @_;
1488 1627
… …
1494 $self->{layout}->set_width ($self->{w}); 1633 $self->{layout}->set_width ($self->{w});
1495 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1634 $self->{layout}->set_ellipsise ($self->{ellipsise});
1496 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1635 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1497 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1636 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1637
1499 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1638 new_from_layout CFClient::Texture $self->{layout}
1639 };
1500 1640
1641 unless (exists $self->{ox}) {
1501 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1642 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1502 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1643 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1503 : ($self->{w} - $tex->{w}) * 0.5); 1644 : ($self->{w} - $tex->{w}) * 0.5);
1504 1645
1505 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1646 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1506 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1647 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1507 : ($self->{h} - $tex->{h}) * 0.5); 1648 : ($self->{h} - $tex->{h}) * 0.5);
1508
1509 $tex
1510 }; 1649 };
1511 1650
1512 glEnable GL_TEXTURE_2D; 1651 glEnable GL_TEXTURE_2D;
1513 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1514 1653
1654 glColor_premultiply @{$self->{fg}}
1515 if ($tex->{format} == GL_ALPHA) { 1655 if $tex->{format} == GL_ALPHA;
1516 glColor @{$self->{fg}}; 1656
1517 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1518 } else {
1519 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1657 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1520 }
1521 1658
1522 glDisable GL_TEXTURE_2D; 1659 glDisable GL_TEXTURE_2D;
1523} 1660}
1524 1661
1525############################################################################# 1662#############################################################################
… …
1552 1689
1553 delete $self->{cur_h}; 1690 delete $self->{cur_h};
1554 1691
1555 return if $self->{text} eq $text; 1692 return if $self->{text} eq $text;
1556 1693
1557 delete $self->{texture};
1558
1559 $self->{last_activity} = $::NOW; 1694 $self->{last_activity} = $::NOW;
1560 $self->{text} = $text; 1695 $self->{text} = $text;
1561 1696
1562 $text =~ s/./*/g if $self->{hidden}; 1697 $text =~ s/./*/g if $self->{hidden};
1563 $self->{layout}->set_text ("$text "); 1698 $self->{layout}->set_text ("$text ");
1564 1699
1565 $self->_emit (changed => $self->{text}); 1700 $self->_emit (changed => $self->{text});
1701 $self->update;
1566} 1702}
1567 1703
1568sub set_text { 1704sub set_text {
1569 my ($self, $text) = @_; 1705 my ($self, $text) = @_;
1570 1706
1571 $self->{cursor} = length $text; 1707 $self->{cursor} = length $text;
1572 $self->_set_text ($text); 1708 $self->_set_text ($text);
1573 $self->update; 1709
1574 $self->check_size; 1710 $self->realloc;
1575} 1711}
1576 1712
1577sub get_text { 1713sub get_text {
1578 $_[0]{text} 1714 $_[0]{text}
1579} 1715}
… …
1609 $self->{cursor} = length $text; 1745 $self->{cursor} = length $text;
1610 } elsif ($uni == 27) { 1746 } elsif ($uni == 27) {
1611 $self->_emit ('escape'); 1747 $self->_emit ('escape');
1612 } elsif ($uni) { 1748 } elsif ($uni) {
1613 substr $text, $self->{cursor}++, 0, chr $uni; 1749 substr $text, $self->{cursor}++, 0, chr $uni;
1750 } else {
1751 return 0;
1614 } 1752 }
1615 1753
1616 $self->_set_text ($text); 1754 $self->_set_text ($text);
1617 $self->update; 1755
1618 $self->check_size; 1756 $self->realloc;
1757
1758 1
1619} 1759}
1620 1760
1621sub focus_in { 1761sub focus_in {
1622 my ($self) = @_; 1762 my ($self) = @_;
1623 1763
… …
1638 utf8::encode $text; 1778 utf8::encode $text;
1639 $self->{cursor} = length substr $text, 0, $idx; 1779 $self->{cursor} = length substr $text, 0, $idx;
1640 1780
1641 $self->_set_text ($self->{text}); 1781 $self->_set_text ($self->{text});
1642 $self->update; 1782 $self->update;
1783
1784 1
1643} 1785}
1644 1786
1645sub mouse_motion { 1787sub mouse_motion {
1646 my ($self, $ev, $x, $y) = @_; 1788 my ($self, $ev, $x, $y) = @_;
1647# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1789# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1790
1791 0
1648} 1792}
1649 1793
1650sub _draw { 1794sub _draw {
1651 my ($self) = @_; 1795 my ($self) = @_;
1652 1796
1653 local $self->{fg} = $self->{fg}; 1797 local $self->{fg} = $self->{fg};
1654 1798
1655 if ($FOCUS == $self) { 1799 if ($FOCUS == $self) {
1656 glColor @{$self->{active_bg}}; 1800 glColor_premultiply @{$self->{active_bg}};
1657 $self->{fg} = $self->{active_fg}; 1801 $self->{fg} = $self->{active_fg};
1658 } else { 1802 } else {
1659 glColor @{$self->{bg}}; 1803 glColor_premultiply @{$self->{bg}};
1660 } 1804 }
1661 1805
1662 glEnable GL_BLEND; 1806 glEnable GL_BLEND;
1663 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1807 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1664 glBegin GL_QUADS; 1808 glBegin GL_QUADS;
1665 glVertex 0 , 0; 1809 glVertex 0 , 0;
1666 glVertex 0 , $self->{h}; 1810 glVertex 0 , $self->{h};
1667 glVertex $self->{w}, $self->{h}; 1811 glVertex $self->{w}, $self->{h};
1668 glVertex $self->{w}, 0; 1812 glVertex $self->{w}, 0;
… …
1729 } else { 1873 } else {
1730 $self->set_text ($self->{history_saveback}); 1874 $self->set_text ($self->{history_saveback});
1731 } 1875 }
1732 1876
1733 } else { 1877 } else {
1734 $self->SUPER::key_down ($ev); 1878 return $self->SUPER::key_down ($ev)
1879 }
1880
1735 } 1881 1
1736
1737} 1882}
1738 1883
1739############################################################################# 1884#############################################################################
1740 1885
1741package CFClient::UI::Button; 1886package CFClient::UI::Button;
… …
1750 1895
1751sub new { 1896sub new {
1752 my $class = shift; 1897 my $class = shift;
1753 1898
1754 $class->SUPER::new ( 1899 $class->SUPER::new (
1755 padding => 4, 1900 padding_x => 4,
1901 padding_y => 4,
1756 fg => [1, 1, 1], 1902 fg => [1, 1, 1],
1757 active_fg => [0, 0, 1], 1903 active_fg => [0, 0, 1],
1758 can_hover => 1, 1904 can_hover => 1,
1759 align => 0, 1905 align => 0,
1760 valign => 0, 1906 valign => 0,
… …
1769 my ($self, $ev, $x, $y) = @_; 1915 my ($self, $ev, $x, $y) = @_;
1770 1916
1771 $self->emit ("activate") 1917 $self->emit ("activate")
1772 if $x >= 0 && $x < $self->{w} 1918 if $x >= 0 && $x < $self->{w}
1773 && $y >= 0 && $y < $self->{h}; 1919 && $y >= 0 && $y < $self->{h};
1920
1921 1
1774} 1922}
1775 1923
1776sub _draw { 1924sub _draw {
1777 my ($self) = @_; 1925 my ($self) = @_;
1778 1926
1779 local $self->{fg} = $self->{fg}; 1927 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1780
1781 if ($GRAB == $self) {
1782 $self->{fg} = $self->{active_fg};
1783 }
1784 1928
1785 glEnable GL_TEXTURE_2D; 1929 glEnable GL_TEXTURE_2D;
1786 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1930 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1787 glColor 0, 0, 0, 1; 1931 glColor 0, 0, 0, 1;
1788 1932
… …
1807 1951
1808sub new { 1952sub new {
1809 my $class = shift; 1953 my $class = shift;
1810 1954
1811 $class->SUPER::new ( 1955 $class->SUPER::new (
1812 padding => 2, 1956 padding_x => 2,
1957 padding_y => 2,
1813 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1814 active_fg => [1, 1, 0], 1959 active_fg => [1, 1, 0],
1815 bg => [0, 0, 0, 0.2], 1960 bg => [0, 0, 0, 0.2],
1816 active_bg => [1, 1, 1, 0.5], 1961 active_bg => [1, 1, 1, 0.5],
1817 state => 0, 1962 state => 0,
… …
1821} 1966}
1822 1967
1823sub size_request { 1968sub size_request {
1824 my ($self) = @_; 1969 my ($self) = @_;
1825 1970
1826 ($self->{padding} * 2 + 6) x 2 1971 (6) x 2
1827} 1972}
1828 1973
1829sub button_down { 1974sub button_down {
1830 my ($self, $ev, $x, $y) = @_; 1975 my ($self, $ev, $x, $y) = @_;
1831 1976
1832 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1977 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1833 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1978 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1834 $self->{state} = !$self->{state}; 1979 $self->{state} = !$self->{state};
1835 $self->_emit (changed => $self->{state}); 1980 $self->_emit (changed => $self->{state});
1981 } else {
1982 return 0
1983 }
1984
1836 } 1985 1
1837} 1986}
1838 1987
1839sub _draw { 1988sub _draw {
1840 my ($self) = @_; 1989 my ($self) = @_;
1841 1990
1842 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1843 1992
1844 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1993 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1845 1994
1846 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1995 my ($w, $h) = @$self{qw(w h)};
1996
1997 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1847 1998
1848 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1999 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1849 2000
1850 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2001 my $tex = $self->{state} ? $tex[1] : $tex[0];
1851 2002
… …
2006 2157
2007 my $h1 = $self->{h} * (1 - $ycut1); 2158 my $h1 = $self->{h} * (1 - $ycut1);
2008 my $h2 = $self->{h} * (1 - $ycut2); 2159 my $h2 = $self->{h} * (1 - $ycut2);
2009 2160
2010 glEnable GL_BLEND; 2161 glEnable GL_BLEND;
2011 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2162 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2163 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2012 glEnable GL_TEXTURE_2D; 2164 glEnable GL_TEXTURE_2D;
2013 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2165 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2014 2166
2015 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2167 glBindTexture GL_TEXTURE_2D, $t1->{name};
2016 glBegin GL_QUADS; 2168 glBegin GL_QUADS;
… …
2116 fg => [1, 1, 1], 2268 fg => [1, 1, 1],
2117 active_fg => [0, 0, 0], 2269 active_fg => [0, 0, 0],
2118 bg => [0, 0, 0, 0.2], 2270 bg => [0, 0, 0, 0.2],
2119 active_bg => [1, 1, 1, 0.5], 2271 active_bg => [1, 1, 1, 0.5],
2120 range => [0, 0, 100, 10, 0], 2272 range => [0, 0, 100, 10, 0],
2121 req_w => $::WIDTH / 80, 2273 min_w => $::WIDTH / 80,
2122 req_h => $::WIDTH / 80, 2274 min_h => $::WIDTH / 80,
2123 vertical => 0, 2275 vertical => 0,
2124 can_hover => 1, 2276 can_hover => 1,
2125 inner_pad => 0.02, 2277 inner_pad => 0.02,
2126 @_ 2278 @_
2127 ); 2279 );
… …
2130 $self->update; 2282 $self->update;
2131 2283
2132 $self 2284 $self
2133} 2285}
2134 2286
2287sub changed { }
2288
2135sub set_range { 2289sub set_range {
2136 my ($self, $range) = @_; 2290 my ($self, $range) = @_;
2137 2291
2138 $self->{range} = $range; 2292 ($range, $self->{range}) = ($self->{range}, $range);
2139 2293
2140 $self->update; 2294 $self->update
2295 if "@$range" ne "@{$self->{range}}";
2141} 2296}
2142 2297
2143sub set_value { 2298sub set_value {
2144 my ($self, $value) = @_; 2299 my ($self, $value) = @_;
2145 2300
… …
2164} 2319}
2165 2320
2166sub size_request { 2321sub size_request {
2167 my ($self) = @_; 2322 my ($self) = @_;
2168 2323
2169 my $w = $self->{req_w}; 2324 ($self->{req_w}, $self->{req_h})
2170 my $h = $self->{req_h};
2171
2172 $self->{vertical} ? ($h, $w) : ($w, $h)
2173} 2325}
2174 2326
2175sub button_down { 2327sub button_down {
2176 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2177 2329
2178 $self->SUPER::button_down ($ev, $x, $y); 2330 $self->SUPER::button_down ($ev, $x, $y);
2179 2331
2180 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2332 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2181 2333
2182 $self->mouse_motion ($ev, $x, $y); 2334 $self->mouse_motion ($ev, $x, $y)
2183} 2335}
2184 2336
2185sub mouse_motion { 2337sub mouse_motion {
2186 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2187 2339
… …
2191 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2343 my (undef, $lo, $hi, $page) = @{$self->{range}};
2192 2344
2193 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2345 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2194 2346
2195 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2347 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2348 } else {
2349 return 0;
2350 }
2351
2196 } 2352 1
2197} 2353}
2198 2354
2199sub update { 2355sub update {
2200 my ($self) = @_; 2356 my ($self) = @_;
2201 2357
2202 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2358 delete $self->{knob_w};
2359 $self->SUPER::update;
2360}
2361
2362sub _draw {
2363 my ($self) = @_;
2364
2365 unless ($self->{knob_w}) {
2203 $self->set_value ($self->{range}[0]); 2366 $self->set_value ($self->{range}[0]);
2204 2367
2205 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2368 my ($value, $lo, $hi, $page) = @{$self->{range}};
2206 my $range = ($hi - $page - $lo) || 1e-100; 2369 my $range = ($hi - $page - $lo) || 1e-100;
2207 2370
… …
2213 $value = ($value - $lo) / $range; 2376 $value = ($value - $lo) / $range;
2214 $value = $value * $self->{scale} + $self->{offset}; 2377 $value = $value * $self->{scale} + $self->{offset};
2215 2378
2216 $self->{knob_x} = $value - $knob_w * 0.5; 2379 $self->{knob_x} = $value - $knob_w * 0.5;
2217 $self->{knob_w} = $knob_w; 2380 $self->{knob_w} = $knob_w;
2218 }); 2381 }
2219
2220 $self->SUPER::update;
2221}
2222
2223sub _draw {
2224 my ($self) = @_;
2225 2382
2226 $self->SUPER::_draw (); 2383 $self->SUPER::_draw ();
2227 2384
2228 glScale $self->{w}, $self->{h}; 2385 glScale $self->{w}, $self->{h};
2229 2386
… …
2423 2580
2424 delete $self->{texture}; 2581 delete $self->{texture};
2425 } 2582 }
2426 2583
2427 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2584 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2428 glClearColor 0.5, 0.5, 0.5, 0; 2585 glClearColor 0, 0, 0, 0;
2429 glClear GL_COLOR_BUFFER_BIT; 2586 glClear GL_COLOR_BUFFER_BIT;
2430 2587
2431 my $top = int $self->{children}[1]{range}[0]; 2588 my $top = int $self->{children}[1]{range}[0];
2432 2589
2433 my $y0 = $top; 2590 my $y0 = $top;
… …
2468sub _draw { 2625sub _draw {
2469 my ($self) = @_; 2626 my ($self) = @_;
2470 2627
2471 glEnable GL_TEXTURE_2D; 2628 glEnable GL_TEXTURE_2D;
2472 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2629 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2473 glColor 1, 1, 1, 1; 2630 glColor 0, 0, 0, 1;
2474 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2631 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2475 glDisable GL_TEXTURE_2D; 2632 glDisable GL_TEXTURE_2D;
2476 2633
2477 $self->{children}[1]->draw; 2634 $self->{children}[1]->draw;
2478 2635
2479} 2636}
… …
2528 2685
2529sub new { 2686sub new {
2530 my $class = shift; 2687 my $class = shift;
2531 2688
2532 my $self = $class->SUPER::new ( 2689 my $self = $class->SUPER::new (
2533 state => 0, 2690 state => 0,
2534 connect_activate => \&toggle_flopper, 2691 on_activate => \&toggle_flopper,
2535 @_ 2692 @_
2536 ); 2693 );
2537 2694
2538 if ($self->{state}) {
2539 $self->{state} = 0;
2540 $self->toggle_flopper;
2541 }
2542
2543 $self 2695 $self
2544} 2696}
2545 2697
2546sub toggle_flopper { 2698sub toggle_flopper {
2547 my ($self) = @_; 2699 my ($self) = @_;
2548 2700
2549 # TODO: use animation 2701 $self->{other}->toggle_visibility;
2550 if ($self->{state} = !$self->{state}) {
2551 $CFClient::UI::ROOT->add ($self->{other});
2552 $self->{other}->move ($self->coord2global (0, $self->{h}));
2553 $self->_emit ("open");
2554 } else {
2555 $CFClient::UI::ROOT->remove ($self->{other});
2556 $self->_emit ("close");
2557 }
2558
2559 $self->_emit (changed => $self->{state});
2560} 2702}
2561 2703
2562############################################################################# 2704#############################################################################
2563 2705
2564package CFClient::UI::Tooltip; 2706package CFClient::UI::Tooltip;
… …
2577} 2719}
2578 2720
2579sub set_tooltip_from { 2721sub set_tooltip_from {
2580 my ($self, $widget) = @_; 2722 my ($self, $widget) = @_;
2581 2723
2724 my $tooltip = $widget->{tooltip};
2725
2726 if ($ENV{CFPLUS_DEBUG} & 2) {
2727 $tooltip .= "\n\n" . (ref $widget) . "\n"
2728 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2729 . "req $widget->{req_w} $widget->{req_h}\n"
2730 . "visible $widget->{visible}";
2731 }
2732
2582 $self->add (new CFClient::UI::Label 2733 $self->add (new CFClient::UI::Label
2583 markup => $widget->{tooltip}, 2734 markup => $tooltip,
2584 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2735 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2585 fontsize => 0.8, 2736 fontsize => 0.8,
2586 fg => [0, 0, 0, 1], 2737 fg => [0, 0, 0, 1],
2587 ellipsise => 0, 2738 ellipsise => 0,
2588 font => ($widget->{tooltip_font} || $::FONT_PROP), 2739 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2599 2750
2600sub size_allocate { 2751sub size_allocate {
2601 my ($self, $w, $h) = @_; 2752 my ($self, $w, $h) = @_;
2602 2753
2603 $self->SUPER::size_allocate ($w - 4, $h - 4); 2754 $self->SUPER::size_allocate ($w - 4, $h - 4);
2755}
2756
2757sub visibility_change {
2758 my ($self, $visible) = @_;
2759
2760 return unless $visible;
2761
2762 $self->{root}->on_post_alloc ("move_$self" => sub {
2763 my $widget = $self->{owner}
2764 or return;
2765
2766 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2767
2768 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2769 if $x + $self->{w} > $::WIDTH;
2770
2771 $self->move_abs ($x, $y);
2772 });
2604} 2773}
2605 2774
2606sub _draw { 2775sub _draw {
2607 my ($self) = @_; 2776 my ($self) = @_;
2608 2777
… …
2625 glVertex $w, $h; 2794 glVertex $w, $h;
2626 glVertex $w, 0; 2795 glVertex $w, 0;
2627 glEnd; 2796 glEnd;
2628 2797
2629 glTranslate 2 - 0.375, 2 - 0.375; 2798 glTranslate 2 - 0.375, 2 - 0.375;
2799
2630 $self->SUPER::_draw; 2800 $self->SUPER::_draw;
2631} 2801}
2632 2802
2633############################################################################# 2803#############################################################################
2634 2804
… …
2693 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2863 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2694 2864
2695 if ($tex) { 2865 if ($tex) {
2696 glEnable GL_TEXTURE_2D; 2866 glEnable GL_TEXTURE_2D;
2697 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2867 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2698 glColor 1, 1, 1, 1; 2868 glColor 0, 0, 0, 1;
2699 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2869 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2700 glDisable GL_TEXTURE_2D; 2870 glDisable GL_TEXTURE_2D;
2701 } 2871 }
2702} 2872}
2703 2873
… …
2710 $self->SUPER::DESTROY; 2880 $self->SUPER::DESTROY;
2711} 2881}
2712 2882
2713############################################################################# 2883#############################################################################
2714 2884
2715package CFClient::UI::Inventory; 2885package CFClient::UI::Buttonbar;
2716 2886
2717our @ISA = CFClient::UI::ScrolledWindow::; 2887our @ISA = CFClient::UI::HBox::;
2718 2888
2719sub new { 2889# TODO: should actualyl wrap buttons and other goodies.
2720 my $class = shift;
2721
2722 my $self = $class->SUPER::new (
2723 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2724 @_,
2725 );
2726
2727 $self
2728}
2729
2730sub set_items {
2731 my ($self, $items) = @_;
2732
2733 $self->{scrolled}->clear;
2734 return unless $items;
2735
2736 my @items = sort {
2737 ($a->{type} <=> $b->{type})
2738 or ($a->{name} cmp $b->{name})
2739 } @$items;
2740
2741 $self->{real_items} = \@items;
2742
2743 my $row = 0;
2744 for my $item (@items) {
2745 CFClient::Item::update_widgets $item;
2746
2747 $self->{scrolled}->add (0, $row, $item->{face_widget});
2748 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2749 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2750
2751 $row++;
2752 }
2753
2754# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2755}
2756
2757sub size_request {
2758 my ($self) = @_;
2759 ($self->{req_w}, $self->{req_h});
2760}
2761 2890
2762############################################################################# 2891#############################################################################
2763 2892
2764package CFClient::UI::Menu; 2893package CFClient::UI::Menu;
2765 2894
… …
2806 # maybe save $GRAB? must be careful about events... 2935 # maybe save $GRAB? must be careful about events...
2807 $GRAB = $self; 2936 $GRAB = $self;
2808 $self->{button} = $ev->{button}; 2937 $self->{button} = $ev->{button};
2809 2938
2810 $self->show; 2939 $self->show;
2811 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2940 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2812} 2941}
2813 2942
2814sub mouse_motion { 2943sub mouse_motion {
2815 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2816 2945
2817 # TODO: should use vbox->find_widget or so 2946 # TODO: should use vbox->find_widget or so
2818 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2947 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2819 $self->{hover} = $self->{item}{$HOVER}; 2948 $self->{hover} = $self->{item}{$HOVER};
2949
2950 0
2820} 2951}
2821 2952
2822sub button_up { 2953sub button_up {
2823 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2824 2955
… …
2826 undef $GRAB; 2957 undef $GRAB;
2827 $self->hide; 2958 $self->hide;
2828 2959
2829 $self->_emit ("popdown"); 2960 $self->_emit ("popdown");
2830 $self->{hover}[1]->() if $self->{hover}; 2961 $self->{hover}[1]->() if $self->{hover};
2962 } else {
2963 return 0
2964 }
2965
2831 } 2966 1
2832} 2967}
2833 2968
2834############################################################################# 2969#############################################################################
2835 2970
2836package CFClient::UI::Statusbox; 2971package CFClient::UI::Multiplexer;
2837 2972
2838our @ISA = CFClient::UI::VBox::; 2973our @ISA = CFClient::UI::Container::;
2839 2974
2840sub new { 2975sub new {
2841 my $class = shift; 2976 my $class = shift;
2842 2977
2843 $class->SUPER::new ( 2978 my $self = $class->SUPER::new (
2979 @_,
2980 );
2981
2982 $self->{current} = $self->{children}[0]
2983 if @{ $self->{children} };
2984
2985 $self
2986}
2987
2988sub add {
2989 my ($self, @widgets) = @_;
2990
2991 $self->SUPER::add (@widgets);
2992
2993 $self->{current} = $self->{children}[0]
2994 if @{ $self->{children} };
2995}
2996
2997sub set_current_page {
2998 my ($self, $page_or_widget) = @_;
2999
3000 my $widget = ref $page_or_widget
3001 ? $page_or_widget
3002 : $self->{children}[$page_or_widget];
3003
3004 $self->{current} = $widget;
3005 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3006
3007 $self->_emit (page_changed => $self->{current});
3008
3009 $self->realloc;
3010}
3011
3012sub visible_children {
3013 $_[0]{current}
3014}
3015
3016sub size_request {
3017 my ($self) = @_;
3018
3019 $self->{current}->size_request
3020}
3021
3022sub size_allocate {
3023 my ($self, $w, $h) = @_;
3024
3025 $self->{current}->configure (0, 0, $w, $h);
3026}
3027
3028sub _draw {
3029 my ($self) = @_;
3030
3031 $self->{current}->draw;
3032}
3033
3034#############################################################################
3035
3036package CFClient::UI::Notebook;
3037
3038our @ISA = CFClient::UI::VBox::;
3039
3040sub new {
3041 my $class = shift;
3042
3043 my $self = $class->SUPER::new (
3044 buttonbar => (new CFClient::UI::Buttonbar),
3045 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3046 # filter => # will be put between multiplexer and $self
3047 @_,
3048 );
3049
3050 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3051 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3052
3053 $self
3054}
3055
3056sub add {
3057 my ($self, $title, $widget, $tooltip) = @_;
3058
3059 Scalar::Util::weaken $self;
3060
3061 $self->{buttonbar}->add (new CFClient::UI::Button
3062 markup => $title,
3063 tooltip => $tooltip,
3064 on_activate => sub { $self->set_current_page ($widget) },
3065 );
3066
3067 $self->{multiplexer}->add ($widget);
3068}
3069
3070sub set_current_page {
3071 my ($self, $page) = @_;
3072
3073 $self->{multiplexer}->set_current_page ($page);
3074 $self->_emit (page_changed => $self->{multiplexer}{current});
3075}
3076
3077#############################################################################
3078
3079package CFClient::UI::Statusbox;
3080
3081our @ISA = CFClient::UI::VBox::;
3082
3083sub new {
3084 my $class = shift;
3085
3086 my $self = $class->SUPER::new (
2844 fontsize => 0.8, 3087 fontsize => 0.8,
2845 @_, 3088 @_,
2846 ) 3089 );
3090
3091 Scalar::Util::weaken (my $this = $self);
3092
3093 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3094
3095 $self
2847} 3096}
2848 3097
2849sub reorder { 3098sub reorder {
2850 my ($self) = @_; 3099 my ($self) = @_;
2851 my $NOW = time; 3100 my $NOW = Time::HiRes::time;
3101
3102 # freeze display when hovering over any label
3103 return if $CFClient::UI::TOOLTIP->{owner}
3104 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3105 values %{ $self->{item} };
2852 3106
2853 while (my ($k, $v) = each %{ $self->{item} }) { 3107 while (my ($k, $v) = each %{ $self->{item} }) {
2854 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3108 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2855 } 3109 }
2856 3110
… …
2859 my @items = sort { 3113 my @items = sort {
2860 $a->{pri} <=> $b->{pri} 3114 $a->{pri} <=> $b->{pri}
2861 or $b->{id} <=> $a->{id} 3115 or $b->{id} <=> $a->{id}
2862 } values %{ $self->{item} }; 3116 } values %{ $self->{item} };
2863 3117
3118 $self->{timer}->interval (1);
3119
2864 my $count = 10 + 1; 3120 my $count = 10 + 1;
2865 for my $item (@items) { 3121 for my $item (@items) {
2866 last unless --$count; 3122 last unless --$count;
2867 3123
2868 push @widgets, $item->{label} ||= do { 3124 my $label = $item->{label} ||= do {
2869 # TODO: doesn't handle markup well (read as: at all) 3125 # TODO: doesn't handle markup well (read as: at all)
2870 my $short = $item->{count} > 1 3126 my $short = $item->{count} > 1
2871 ? "<b>$item->{count} ×</b> $item->{text}" 3127 ? "<b>$item->{count} ×</b> $item->{text}"
2872 : $item->{text}; 3128 : $item->{text};
2873 3129
… …
2881 tooltip => $item->{tooltip}, 3137 tooltip => $item->{tooltip},
2882 tooltip_font => $::FONT_PROP, 3138 tooltip_font => $::FONT_PROP,
2883 tooltip_width => 0.67, 3139 tooltip_width => 0.67,
2884 fontsize => $item->{fontsize} || $self->{fontsize}, 3140 fontsize => $item->{fontsize} || $self->{fontsize},
2885 max_w => $::WIDTH * 0.44, 3141 max_w => $::WIDTH * 0.44,
2886 fg => $item->{fg}, 3142 fg => [@{ $item->{fg} }],
2887 can_events => 1, 3143 can_events => 1,
2888 can_hover => 1 3144 can_hover => 1
2889 }; 3145 };
3146
3147 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3148 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3149 $label->update;
3150 $label->set_max_size (undef, $label->{req_h} * $diff)
3151 if $diff < 1;
3152 $self->{timer}->interval (1/30);
3153 } else {
3154 $label->{fg}[3] = $item->{fg}[3] || 1;
3155 }
3156
3157 push @widgets, $label;
2890 } 3158 }
2891 3159
2892 $self->clear; 3160 $self->clear;
2893 $self->SUPER::add (reverse @widgets); 3161 $self->SUPER::add (reverse @widgets);
2894} 3162}
… …
2899 $text =~ s/^\s+//; 3167 $text =~ s/^\s+//;
2900 $text =~ s/\s+$//; 3168 $text =~ s/\s+$//;
2901 3169
2902 return unless $text; 3170 return unless $text;
2903 3171
2904 my $timeout = time + ((delete $arg{timeout}) || 60); 3172 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2905 3173
2906 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3174 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2907 3175
2908 if (my $item = $self->{item}{$group}) { 3176 if (my $item = $self->{item}{$group}) {
2909 if ($item->{text} eq $text) { 3177 if ($item->{text} eq $text) {
… …
2939 3207
2940 $self->reorder; 3208 $self->reorder;
2941 $self->SUPER::reconfigure; 3209 $self->SUPER::reconfigure;
2942} 3210}
2943 3211
3212sub DESTROY {
3213 my ($self) = @_;
3214
3215 $self->{timer}->cancel;
3216
3217 $self->SUPER::DESTROY;
3218}
3219
2944############################################################################# 3220#############################################################################
2945 3221
2946package CFClient::UI::Root; 3222package CFClient::UI::Inventory;
2947 3223
2948our @ISA = CFClient::UI::Container::; 3224our @ISA = CFClient::UI::ScrolledWindow::;
2949
2950use CFClient::OpenGL;
2951 3225
2952sub new { 3226sub new {
2953 my $class = shift; 3227 my $class = shift;
2954 3228
2955 $class->SUPER::new ( 3229 my $self = $class->SUPER::new (
3230 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3231 @_,
3232 );
3233
3234 $self
3235}
3236
3237sub set_items {
3238 my ($self, $items) = @_;
3239
3240 $self->{child}->clear;
3241 return unless $items;
3242
3243 my @items = sort {
3244 ($a->{type} <=> $b->{type})
3245 or ($a->{name} cmp $b->{name})
3246 } @$items;
3247
3248 $self->{real_items} = \@items;
3249
3250 my $row = 0;
3251 for my $item (@items) {
3252 CFClient::Item::update_widgets $item;
3253
3254 $self->{child}->add (0, $row, $item->{face_widget});
3255 $self->{child}->add (1, $row, $item->{desc_widget});
3256 $self->{child}->add (2, $row, $item->{weight_widget});
3257
3258 $row++;
3259 }
3260}
3261
3262#############################################################################
3263
3264package CFClient::UI::BindEditor;
3265
3266our @ISA = CFClient::UI::FancyFrame::;
3267
3268sub new {
3269 my $class = shift;
3270
3271 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3272
3273 $self->add (my $vb = new CFClient::UI::VBox);
3274
3275
3276 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3277 text => "start recording",
3278 tooltip => "Start/Stops recording of actions."
3279 ."All subsequent actions after the recording started will be captured."
3280 ."The actions are displayed after the record was stopped."
3281 ."To bind the action you have to click on the 'Bind' button",
3282 on_activate => sub {
3283 unless ($self->{recording}) {
3284 $self->start;
3285 } else {
3286 $self->stop;
3287 }
3288 });
3289
3290 $vb->add (new CFClient::UI::Label text => "Actions:");
3291 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3292
3293 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3294 $vb->add (my $hb = new CFClient::UI::HBox);
3295 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3296 $hb->add (new CFClient::UI::Button
3297 text => "bind",
3298 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3299 on_activate => sub {
3300 $self->ask_for_bind;
3301 });
3302
3303 $vb->add (my $hb = new CFClient::UI::HBox);
3304 $hb->add (new CFClient::UI::Button
3305 text => "ok",
3306 expand => 1,
3307 tooltip => "This closes the binding editor and saves the binding",
3308 on_activate => sub {
3309 $self->hide;
3310 $self->commit;
3311 });
3312
3313 $hb->add (new CFClient::UI::Button
3314 text => "cancel",
3315 expand => 1,
3316 tooltip => "This closes the binding editor without saving",
3317 on_activate => sub {
3318 $self->hide;
3319 $self->{binding_cancel}->()
3320 if $self->{binding_cancel};
3321 });
3322
3323 $self->update_binding_widgets;
3324
3325 $self
3326}
3327
3328sub commit {
3329 my ($self) = @_;
3330 my ($mod, $sym, $cmds) = $self->get_binding;
3331 if ($sym != 0 && @$cmds > 0) {
3332 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3333 ."'. Don't forget 'Save Config'!");
3334 $self->{binding_change}->($mod, $sym, $cmds)
3335 if $self->{binding_change};
3336 } else {
3337 $::STATUSBOX->add ("No action bound, no key or action specified!");
3338 $self->{binding_cancel}->()
3339 if $self->{binding_cancel};
3340 }
3341}
3342
3343sub start {
3344 my ($self) = @_;
3345
3346 $self->{rec_btn}->set_text ("stop recording");
3347 $self->{recording} = 1;
3348 $self->clear_command_list;
3349 $::CONN->start_record if $::CONN;
3350}
3351
3352sub stop {
3353 my ($self) = @_;
3354
3355 $self->{rec_btn}->set_text ("start recording");
3356 $self->{recording} = 0;
3357
3358 my $rec;
3359 $rec = $::CONN->stop_record if $::CONN;
3360 return unless ref $rec eq 'ARRAY';
3361 $self->set_command_list ($rec);
3362}
3363
3364
3365sub ask_for_bind_and_commit {
3366 my ($self) = @_;
3367 $self->ask_for_bind (1);
3368}
3369
3370sub ask_for_bind {
3371 my ($self, $commit) = @_;
3372
3373 CFClient::Binder::open_binding_dialog (sub {
3374 my ($mod, $sym) = @_;
3375 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3376 $self->update_binding_widgets;
3377 $self->commit if $commit;
3378 });
3379}
3380
3381# $mod and $sym are the modifiers and key symbol
3382# $cmds is a array ref of strings (the commands)
3383# $cb is the callback that is executed on OK
3384# $ccb is the callback that is executed on CANCEL and
3385# when the binding was unsuccessful on OK
3386sub set_binding {
3387 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3388
3389 $self->clear_command_list;
3390 $self->{recording} = 0;
3391 $self->{rec_btn}->set_text ("start recording");
3392
3393 $self->{binding} = [$mod, $sym];
3394 $self->{commands} = $cmds;
3395
3396 $self->{binding_change} = $cb;
3397 $self->{binding_cancel} = $ccb;
3398
3399 $self->update_binding_widgets;
3400}
3401
3402# this is a shortcut method that asks for a binding
3403# and then just binds it.
3404sub do_quick_binding {
3405 my ($self, $cmds) = @_;
3406 $self->set_binding (undef, undef, $cmds, sub {
3407 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3408 });
3409 $self->ask_for_bind (1);
3410}
3411
3412sub update_binding_widgets {
3413 my ($self) = @_;
3414 my ($mod, $sym, $cmds) = $self->get_binding;
3415 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3416 $self->set_command_list ($cmds);
3417}
3418
3419sub get_binding {
3420 my ($self) = @_;
3421 return (
3422 $self->{binding}->[0],
3423 $self->{binding}->[1],
3424 [ grep { defined $_ } @{$self->{commands}} ]
3425 );
3426}
3427
3428sub clear_command_list {
3429 my ($self) = @_;
3430 $self->{cmdbox}->clear ();
3431}
3432
3433sub set_command_list {
3434 my ($self, $cmds) = @_;
3435
3436 $self->{cmdbox}->clear ();
3437 $self->{commands} = $cmds;
3438
3439 my $idx = 0;
3440
3441 for (@$cmds) {
3442 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3443
3444 my $i = $idx;
3445 $hb->add (new CFClient::UI::Label text => $_);
3446 $hb->add (new CFClient::UI::Button
3447 text => "delete",
3448 tooltip => "Deletes the action from the record",
3449 on_activate => sub {
3450 $self->{cmdbox}->remove ($hb);
3451 $cmds->[$i] = undef;
3452 });
3453
3454
3455 $idx++
3456 }
3457}
3458
3459#############################################################################
3460
3461package CFClient::UI::SpellList;
3462
3463our @ISA = CFClient::UI::Table::;
3464
3465sub new {
3466 my $class = shift;
3467
3468 my $self = $class->SUPER::new (
3469 binding => [],
3470 commands => [],
2956 @_, 3471 @_,
2957 ) 3472 )
2958} 3473}
2959 3474
2960sub configure { 3475# XXX: Do sorting? Argl...
2961 my ($self, $x, $y, $w, $h) = @_; 3476sub add_spell {
2962
2963 $self->{w} = $w;
2964 $self->{h} = $h;
2965}
2966
2967sub check_size {
2968 my ($self) = @_; 3477 my ($self, $spell) = @_;
3478 $self->{spells}->{$spell->{name}} = $spell;
2969 3479
2970 $self->size_allocate ($self->{w}, $self->{h}) 3480 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2971 if $self->{w}; 3481 face => $spell->{face},
3482 can_hover => 1,
3483 can_events => 1,
3484 tooltip => $spell->{message});
3485
3486 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3487 text => $spell->{name},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message},
3491 expand => 1);
3492
3493 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3494 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3495 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3496 expand => 1);
3497
3498 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3499 text => "bind to key",
3500 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3501}
3502
3503sub rebuild_spell_list {
3504 my ($self) = @_;
3505 $self->{tbl_idx} = 0;
3506 $self->add_spell ($_) for values %{$self->{spells}};
3507}
3508
3509sub remove_spell {
3510 my ($self, $spell) = @_;
3511 delete $self->{spells}->{$spell->{name}};
3512 $self->rebuild_spell_list;
3513}
3514
3515#############################################################################
3516
3517package CFClient::UI::Root;
3518
3519our @ISA = CFClient::UI::Container::;
3520
3521use List::Util qw(min max);
3522
3523use CFClient::OpenGL;
3524
3525sub new {
3526 my $class = shift;
3527
3528 my $self = $class->SUPER::new (
3529 visible => 1,
3530 @_,
3531 );
3532
3533 Scalar::Util::weaken ($self->{root} = $self);
3534
3535 $self
2972} 3536}
2973 3537
2974sub size_request { 3538sub size_request {
2975 my ($self) = @_; 3539 my ($self) = @_;
2976 3540
2977 ($self->{w}, $self->{h}) 3541 ($self->{w}, $self->{h})
3542}
3543
3544sub _to_pixel {
3545 my ($coord, $size, $max) = @_;
3546
3547 $coord =
3548 $coord eq "center" ? ($max - $size) * 0.5
3549 : $coord eq "max" ? $max
3550 : $coord;
3551
3552 $coord = 0 if $coord < 0;
3553 $coord = $max - $size if $coord > $max - $size;
3554
3555 int $coord + 0.5
2978} 3556}
2979 3557
2980sub size_allocate { 3558sub size_allocate {
2981 my ($self, $w, $h) = @_; 3559 my ($self, $w, $h) = @_;
2982 3560
2983 for my $child ($self->children) { 3561 for my $child ($self->children) {
2984 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3562 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2985 3563
2986 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3564 $X = $child->{force_x} if exists $child->{force_x};
2987 if exists $child->{req_x}; 3565 $Y = $child->{force_y} if exists $child->{force_y};
2988 3566
2989 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3567 $X = _to_pixel $X, $W, $self->{w};
2990 if exists $child->{req_y}; 3568 $Y = _to_pixel $Y, $H, $self->{h};
2991
2992 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2993 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2994 3569
2995 $child->configure ($X, $Y, $W, $H); 3570 $child->configure ($X, $Y, $W, $H);
2996 } 3571 }
2997} 3572}
2998 3573
… …
3009} 3584}
3010 3585
3011sub update { 3586sub update {
3012 my ($self) = @_; 3587 my ($self) = @_;
3013 3588
3014 $self->check_size;
3015 $::WANT_REFRESH++; 3589 $::WANT_REFRESH++;
3016} 3590}
3017 3591
3018sub add { 3592sub add {
3019 my ($self, @children) = @_; 3593 my ($self, @children) = @_;
3020 3594
3021 for (my @widgets = @children; my $w = pop @widgets; ) {
3022 push @widgets, $w->children;
3023 $w->{root} = $self;
3024 $w->{visible} = 1;
3025 }
3026
3027 for my $child (@children) {
3028 $child->{is_toplevel} = 1; 3595 $_->{is_toplevel} = 1
3029 3596 for @children;
3030 # integerise window positions
3031 $child->{x} = int $child->{x};
3032 $child->{y} = int $child->{y};
3033 }
3034 3597
3035 $self->SUPER::add (@children); 3598 $self->SUPER::add (@children);
3036} 3599}
3037 3600
3038sub remove { 3601sub remove {
3039 my ($self, @children) = @_; 3602 my ($self, @children) = @_;
3040 3603
3041 $self->SUPER::remove (@children); 3604 $self->SUPER::remove (@children);
3605
3606 delete $self->{is_toplevel}
3607 for @children;
3042 3608
3043 while (@children) { 3609 while (@children) {
3044 my $w = pop @children; 3610 my $w = pop @children;
3045 push @children, $w->children; 3611 push @children, $w->children;
3046 $w->set_invisible; 3612 $w->set_invisible;
… …
3065 while ($self->{refresh_hook}) { 3631 while ($self->{refresh_hook}) {
3066 $_->() 3632 $_->()
3067 for values %{delete $self->{refresh_hook}}; 3633 for values %{delete $self->{refresh_hook}};
3068 } 3634 }
3069 3635
3070 if ($self->{check_size}) { 3636 if ($self->{realloc}) {
3071 my @queue = ([], []); 3637 my %queue;
3638 my @queue;
3639 my $widget;
3072 3640
3073 for (;;) { 3641 outer:
3074 if ($self->{check_size}) { 3642 while () {
3075 # heuristic: check containers last 3643 if (my $realloc = delete $self->{realloc}) {
3076 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3644 for $widget (values %$realloc) {
3077 for values %{delete $self->{check_size}} 3645 $widget->{visible} or next; # do not resize invisible widgets
3646
3647 $queue{$widget+0}++ and next; # duplicates are common
3648
3649 push @{ $queue[$widget->{visible}] }, $widget;
3650 }
3078 } 3651 }
3079 3652
3080 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3653 while () {
3654 @queue or last outer;
3081 3655
3082 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3656 $widget = pop @{ $queue[-1] || [] }
3083 ? @$widget{qw(user_w user_h)} 3657 and last;
3084 : $widget->size_request;
3085
3086 if (delete $widget->{force_alloc}
3087 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3088 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3089 3658
3659 pop @queue;
3660 }
3661
3662 delete $queue{$widget+0};
3663
3664 my ($w, $h) = $widget->size_request;
3665
3666 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3667 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3668
3669 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3670 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3671
3672 $w = $widget->{force_w} if exists $widget->{force_w};
3673 $h = $widget->{force_h} if exists $widget->{force_h};
3674
3675 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3676 || delete $widget->{force_realloc}) {
3090 $widget->{req_w} = $w; 3677 $widget->{req_w} = $w;
3091 $widget->{req_h} = $h; 3678 $widget->{req_h} = $h;
3092 3679
3093 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3680 $self->{size_alloc}{$widget+0} = $widget;
3094 3681
3095 $widget->{parent}->check_size
3096 if $widget->{parent}; 3682 if (my $parent = $widget->{parent}) {
3683 $self->{realloc}{$parent+0} = $parent
3684 unless $queue{$parent+0};
3685
3686 $parent->{force_size_alloc} = 1;
3687 $self->{size_alloc}{$parent+0} = $parent;
3688 }
3097 } 3689 }
3690
3691 delete $self->{realloc}{$widget+0};
3098 } 3692 }
3099 } 3693 }
3100 3694
3101 while ($self->{size_alloc}) { 3695 while (my $size_alloc = delete $self->{size_alloc}) {
3102 for (values %{delete $self->{size_alloc}}) { 3696 my @queue = sort { $b->{visible} <=> $a->{visible} }
3103 my ($widget, $w, $h) = @$_; 3697 values %$size_alloc;
3698
3699 while () {
3700 my $widget = pop @queue || last;
3701
3702 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3104 3703
3105 $w = 0 if $w < 0; 3704 $w = 0 if $w < 0;
3106 $h = 0 if $h < 0; 3705 $h = 0 if $h < 0;
3107 3706
3707 $w = int $w + 0.5;
3708 $h = int $h + 0.5;
3709
3710 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3711 $widget->{old_w} = $widget->{w};
3712 $widget->{old_h} = $widget->{h};
3713
3108 $widget->{w} = $w; 3714 $widget->{w} = $w;
3109 $widget->{h} = $h; 3715 $widget->{h} = $h;
3716
3110 $widget->emit (size_allocate => $w, $h); 3717 $widget->emit (size_allocate => $w, $h);
3718 }
3111 } 3719 }
3112 } 3720 }
3113 3721
3114 while ($self->{post_alloc_hook}) { 3722 while ($self->{post_alloc_hook}) {
3115 $_->() 3723 $_->()
3116 for values %{delete $self->{post_alloc_hook}}; 3724 for values %{delete $self->{post_alloc_hook}};
3117 } 3725 }
3726
3118 3727
3119 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3728 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3120 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3729 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3121 glClear GL_COLOR_BUFFER_BIT; 3730 glClear GL_COLOR_BUFFER_BIT;
3122 3731
… …
3124 glLoadIdentity; 3733 glLoadIdentity;
3125 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3734 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3126 glMatrixMode GL_MODELVIEW; 3735 glMatrixMode GL_MODELVIEW;
3127 glLoadIdentity; 3736 glLoadIdentity;
3128 3737
3738 {
3739 package CFClient::UI::Base;
3740
3741 ($draw_x, $draw_y, $draw_w, $draw_h) =
3742 (0, 0, $self->{w}, $self->{h});
3743 }
3744
3129 $self->_draw; 3745 $self->_draw;
3130} 3746}
3131 3747
3132############################################################################# 3748#############################################################################
3133 3749

Diff Legend

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