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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.280 by root, Mon Jun 5 01:22:08 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 delete $self->{max_w}; $self->{max_w} = $w if $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $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; 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;
… …
1101 col_expand => [], 1257 col_expand => [],
1102 @_, 1258 @_,
1103 ) 1259 )
1104} 1260}
1105 1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1264}
1265
1106sub add { 1266sub add {
1107 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1108 1268
1109 $child->set_parent ($self); 1269 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1111 1271
1112 $child->check_size; 1272 $self->realloc;
1113} 1273}
1114 1274
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs 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) = @_;
1122 1278
1123 my @children = $self->children; 1279 my @children = $self->children;
1124 delete $self->{children}; 1280 delete $self->{children};
… …
1126 for (@children) { 1282 for (@children) {
1127 delete $_->{parent}; 1283 delete $_->{parent};
1128 $_->hide; 1284 $_->hide;
1129 } 1285 }
1130 1286
1131 $self->update; 1287 $self->realloc;
1132} 1288}
1133 1289
1134sub get_wh { 1290sub get_wh {
1135 my ($self) = @_; 1291 my ($self) = @_;
1136 1292
… …
1167sub size_allocate { 1323sub size_allocate {
1168 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1169 1325
1170 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1171 1327
1172 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1174 1330
1175 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1388 }
1233} 1389}
1234 1390
1235############################################################################# 1391#############################################################################
1236 1392
1237package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1394
1241our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1242 1396
1243sub size_request { 1397sub size_request {
1244 my ($self) = @_; 1398 my ($self) = @_;
1245 1399
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1247 1401 ? (
1248 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1404 )
1251 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1252} 1409}
1253 1410
1254sub size_allocate { 1411sub size_allocate {
1255 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1256 1413
1257 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1415 my $children = $self->{children};
1260 1416
1261 my @h = map $_->{req_w}, @$children; 1417 my @req;
1262 1418
1263 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1264 1420 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } 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 {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1435 }
1279 } 1436 }
1280 1437
1281 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1282 1439
1283 my $y = 0; 1440 my $pos = 0;
1284 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1444
1289 $y += $h; 1445 $pos += $alloc;
1290 } 1446 }
1291 1447
1292 1 1448 1
1293} 1449}
1294 1450
1295############################################################################# 1451#############################################################################
1296 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
1297package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1298 1469
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1302 1471
1303sub size_request { 1472sub new {
1304 my ($self) = @_; 1473 my $class = shift;
1305 1474
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1307 1476 vertical => 1,
1308 ( 1477 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1478 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1479}
1352 1480
1353############################################################################# 1481#############################################################################
1354 1482
1355package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1500 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1374 fontsize => 1, 1502 fontsize => 1,
1375 align => -1, 1503 align => -1,
1376 valign => -1, 1504 valign => -1,
1377 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1378 can_events => 0, 1507 can_events => 0,
1379 %arg 1508 %arg
1380 ); 1509 );
1381 1510
1382 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1418 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1419 1548
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1422 1551
1552 $self->realloc;
1423 $self->update; 1553 $self->update;
1424 $self->check_size;
1425} 1554}
1426 1555
1427sub set_markup { 1556sub set_markup {
1428 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1429 1558
… …
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1563
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1564 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1437 1566
1567 $self->realloc;
1438 $self->update; 1568 $self->update;
1439 $self->check_size;
1440} 1569}
1441 1570
1442sub size_request { 1571sub size_request {
1443 my ($self) = @_; 1572 my ($self) = @_;
1444 1573
… …
1458 1587
1459 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1461 } 1590 }
1462 1591
1463 ( 1592 ($w, $h)
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1593}
1468 1594
1469sub size_allocate { 1595sub size_allocate {
1470 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1471 1597
1598 delete $self->{ox};
1599
1472 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473} 1602}
1474 1603
1475sub set_fontsize { 1604sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1477 1606
1478 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1608 delete $self->{texture};
1480 1609
1481 $self->update; 1610 $self->realloc;
1482 $self->check_size;
1483} 1611}
1484 1612
1485sub _draw { 1613sub _draw {
1486 my ($self) = @_; 1614 my ($self) = @_;
1487 1615
… …
1493 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1625
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1499 1628
1629 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1503 1633
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1637 };
1510 1638
1511 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513 1641
1642 glColor_premultiply @{$self->{fg}}
1514 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1515 glColor @{$self->{fg}}; 1644
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 }
1520 1646
1521 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1522} 1648}
1523 1649
1524############################################################################# 1650#############################################################################
… …
1551 1677
1552 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1553 1679
1554 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1555 1681
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1683 $self->{text} = $text;
1560 1684
1561 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1563 1687
1564 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1565} 1690}
1566 1691
1567sub set_text { 1692sub set_text {
1568 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1569 1694
1570 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1696 $self->_set_text ($text);
1572 $self->update; 1697
1573 $self->check_size; 1698 $self->realloc;
1574} 1699}
1575 1700
1576sub get_text { 1701sub get_text {
1577 $_[0]{text} 1702 $_[0]{text}
1578} 1703}
… …
1608 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1611 } elsif ($uni) { 1736 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1613 } 1740 }
1614 1741
1615 $self->_set_text ($text); 1742 $self->_set_text ($text);
1616 $self->update; 1743
1617 $self->check_size; 1744 $self->realloc;
1745
1746 1
1618} 1747}
1619 1748
1620sub focus_in { 1749sub focus_in {
1621 my ($self) = @_; 1750 my ($self) = @_;
1622 1751
… …
1637 utf8::encode $text; 1766 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1639 1768
1640 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1641 $self->update; 1770 $self->update;
1771
1772 1
1642} 1773}
1643 1774
1644sub mouse_motion { 1775sub mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1647} 1780}
1648 1781
1649sub _draw { 1782sub _draw {
1650 my ($self) = @_; 1783 my ($self) = @_;
1651 1784
1652 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1653 1786
1654 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1657 } else { 1790 } else {
1658 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1659 } 1792 }
1660 1793
1661 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1797 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1728 } else { 1861 } else {
1729 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1730 } 1863 }
1731 1864
1732 } else { 1865 } else {
1733 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1734 } 1869 1
1735
1736} 1870}
1737 1871
1738############################################################################# 1872#############################################################################
1739 1873
1740package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1749 1883
1750sub new { 1884sub new {
1751 my $class = shift; 1885 my $class = shift;
1752 1886
1753 $class->SUPER::new ( 1887 $class->SUPER::new (
1754 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1755 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1757 can_hover => 1, 1892 can_hover => 1,
1758 align => 0, 1893 align => 0,
1759 valign => 0, 1894 valign => 0,
… …
1768 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1769 1904
1770 $self->emit ("activate") 1905 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1773} 1910}
1774 1911
1775sub _draw { 1912sub _draw {
1776 my ($self) = @_; 1913 my ($self) = @_;
1777 1914
1778 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1916
1784 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1787 1920
… …
1806 1939
1807sub new { 1940sub new {
1808 my $class = shift; 1941 my $class = shift;
1809 1942
1810 $class->SUPER::new ( 1943 $class->SUPER::new (
1811 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1812 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 1950 state => 0,
… …
1820} 1954}
1821 1955
1822sub size_request { 1956sub size_request {
1823 my ($self) = @_; 1957 my ($self) = @_;
1824 1958
1825 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1826} 1960}
1827 1961
1828sub button_down { 1962sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1830 1964
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1835 } 1973 1
1836} 1974}
1837 1975
1838sub _draw { 1976sub _draw {
1839 my ($self) = @_; 1977 my ($self) = @_;
1840 1978
1841 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1842 1980
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 1982
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1983 my ($w, $h) = @$self{qw(w h)};
1984
1985 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 1986
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 1988
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 1990
… …
2005 2145
2006 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
2008 2148
2009 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2150 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2151 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2154
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2115 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2122 vertical => 0, 2263 vertical => 0,
2123 can_hover => 1, 2264 can_hover => 1,
2124 inner_pad => 0.02, 2265 inner_pad => 0.02,
2125 @_ 2266 @_
2126 ); 2267 );
… …
2129 $self->update; 2270 $self->update;
2130 2271
2131 $self 2272 $self
2132} 2273}
2133 2274
2275sub changed { }
2276
2134sub set_range { 2277sub set_range {
2135 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2136 2279
2137 $self->{range} = $range; 2280 ($range, $self->{range}) = ($self->{range}, $range);
2138 2281
2139 $self->update; 2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2140} 2284}
2141 2285
2142sub set_value { 2286sub set_value {
2143 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2144 2288
… …
2163} 2307}
2164 2308
2165sub size_request { 2309sub size_request {
2166 my ($self) = @_; 2310 my ($self) = @_;
2167 2311
2168 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2313}
2173 2314
2174sub button_down { 2315sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2176 2317
2177 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2178 2319
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2321
2181 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2182} 2323}
2183 2324
2184sub mouse_motion { 2325sub mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2186 2327
… …
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2332
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2334
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2335 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2336 } else {
2337 return 0;
2338 }
2339
2195 } 2340 1
2196} 2341}
2197 2342
2198sub update { 2343sub update {
2199 my ($self) = @_; 2344 my ($self) = @_;
2200 2345
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2346 delete $self->{knob_w};
2347 $self->SUPER::update;
2348}
2349
2350sub _draw {
2351 my ($self) = @_;
2352
2353 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2203 2355
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2206 2358
… …
2212 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2214 2366
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2217 }); 2369 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2370
2225 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2226 2372
2227 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2228 2374
… …
2422 2568
2423 delete $self->{texture}; 2569 delete $self->{texture};
2424 } 2570 }
2425 2571
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2429 2575
2430 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2431 2577
2432 my $y0 = $top; 2578 my $y0 = $top;
… …
2467sub _draw { 2613sub _draw {
2468 my ($self) = @_; 2614 my ($self) = @_;
2469 2615
2470 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2619 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2475 2621
2476 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2477 2623
2478} 2624}
… …
2527 2673
2528sub new { 2674sub new {
2529 my $class = shift; 2675 my $class = shift;
2530 2676
2531 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2532 state => 0, 2678 state => 0,
2533 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2534 @_ 2680 @_
2535 ); 2681 );
2536 2682
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2683 $self
2543} 2684}
2544 2685
2545sub toggle_flopper { 2686sub toggle_flopper {
2546 my ($self) = @_; 2687 my ($self) = @_;
2547 2688
2548 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2690}
2560 2691
2561############################################################################# 2692#############################################################################
2562 2693
2563package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2576} 2707}
2577 2708
2578sub set_tooltip_from { 2709sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2580 2711
2712 my $tooltip = $widget->{tooltip};
2713
2714 if ($ENV{CFPLUS_DEBUG} & 2) {
2715 $tooltip .= "\n\n" . (ref $widget) . "\n"
2716 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2717 . "req $widget->{req_w} $widget->{req_h}\n"
2718 . "visible $widget->{visible}";
2719 }
2720
2581 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2724 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2726 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2738
2599sub size_allocate { 2739sub size_allocate {
2600 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2601 2741
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2742 $self->SUPER::size_allocate ($w - 4, $h - 4);
2743}
2744
2745sub visibility_change {
2746 my ($self, $visible) = @_;
2747
2748 return unless $visible;
2749
2750 $self->{root}->on_post_alloc ("move_$self" => sub {
2751 my $widget = $self->{owner}
2752 or return;
2753
2754 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2755
2756 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2757 if $x + $self->{w} > $::WIDTH;
2758
2759 $self->move_abs ($x, $y);
2760 });
2603} 2761}
2604 2762
2605sub _draw { 2763sub _draw {
2606 my ($self) = @_; 2764 my ($self) = @_;
2607 2765
… …
2624 glVertex $w, $h; 2782 glVertex $w, $h;
2625 glVertex $w, 0; 2783 glVertex $w, 0;
2626 glEnd; 2784 glEnd;
2627 2785
2628 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2629 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2630} 2789}
2631 2790
2632############################################################################# 2791#############################################################################
2633 2792
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 2852
2694 if ($tex) { 2853 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2700 } 2859 }
2701} 2860}
2702 2861
… …
2709 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2710} 2869}
2711 2870
2712############################################################################# 2871#############################################################################
2713 2872
2714package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2715 2874
2716our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2717 2876
2718sub new { 2877# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797
2798#############################################################################
2799
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846 2878
2847############################################################################# 2879#############################################################################
2848 2880
2849package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2850 2882
… …
2891 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 2924 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2894 2926
2895 $self->show; 2927 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2928 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897} 2929}
2898 2930
2899sub mouse_motion { 2931sub mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2901 2933
2902 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2905} 2939}
2906 2940
2907sub button_up { 2941sub button_up {
2908 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2909 2943
… …
2911 undef $GRAB; 2945 undef $GRAB;
2912 $self->hide; 2946 $self->hide;
2913 2947
2914 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2916 } 2954 1
2917} 2955}
2918 2956
2919############################################################################# 2957#############################################################################
2920 2958
2921package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2922 2960
2923our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2924 2962
2925sub new { 2963sub new {
2926 my $class = shift; 2964 my $class = shift;
2927 2965
2928 $class->SUPER::new ( 2966 my $self = $class->SUPER::new (
2967 @_,
2968 );
2969
2970 $self->{current} = $self->{children}[0]
2971 if @{ $self->{children} };
2972
2973 $self
2974}
2975
2976sub add {
2977 my ($self, @widgets) = @_;
2978
2979 $self->SUPER::add (@widgets);
2980
2981 $self->{current} = $self->{children}[0]
2982 if @{ $self->{children} };
2983}
2984
2985sub set_current_page {
2986 my ($self, $page_or_widget) = @_;
2987
2988 my $widget = ref $page_or_widget
2989 ? $page_or_widget
2990 : $self->{children}[$page_or_widget];
2991
2992 $self->{current} = $widget;
2993 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2994
2995 $self->_emit (page_changed => $self->{current});
2996
2997 $self->realloc;
2998}
2999
3000sub visible_children {
3001 $_[0]{current}
3002}
3003
3004sub size_request {
3005 my ($self) = @_;
3006
3007 $self->{current}->size_request
3008}
3009
3010sub size_allocate {
3011 my ($self, $w, $h) = @_;
3012
3013 $self->{current}->configure (0, 0, $w, $h);
3014}
3015
3016sub _draw {
3017 my ($self) = @_;
3018
3019 $self->{current}->draw;
3020}
3021
3022#############################################################################
3023
3024package CFClient::UI::Notebook;
3025
3026our @ISA = CFClient::UI::VBox::;
3027
3028sub new {
3029 my $class = shift;
3030
3031 my $self = $class->SUPER::new (
3032 buttonbar => (new CFClient::UI::Buttonbar),
3033 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3034 # filter => # will be put between multiplexer and $self
3035 @_,
3036 );
3037
3038 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3039 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3040
3041 $self
3042}
3043
3044sub add {
3045 my ($self, $title, $widget, $tooltip) = @_;
3046
3047 Scalar::Util::weaken $self;
3048
3049 $self->{buttonbar}->add (new CFClient::UI::Button
3050 markup => $title,
3051 tooltip => $tooltip,
3052 on_activate => sub { $self->set_current_page ($widget) },
3053 );
3054
3055 $self->{multiplexer}->add ($widget);
3056}
3057
3058sub set_current_page {
3059 my ($self, $page) = @_;
3060
3061 $self->{multiplexer}->set_current_page ($page);
3062 $self->_emit (page_changed => $self->{multiplexer}{current});
3063}
3064
3065#############################################################################
3066
3067package CFClient::UI::Statusbox;
3068
3069our @ISA = CFClient::UI::VBox::;
3070
3071sub new {
3072 my $class = shift;
3073
3074 my $self = $class->SUPER::new (
2929 fontsize => 0.8, 3075 fontsize => 0.8,
2930 @_, 3076 @_,
2931 ) 3077 );
3078
3079 Scalar::Util::weaken (my $this = $self);
3080
3081 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub {
3082 $this->reorder;
3083 $this->update;
3084 });
3085
3086 $self
2932} 3087}
2933 3088
2934sub reorder { 3089sub reorder {
2935 my ($self) = @_; 3090 my ($self) = @_;
2936 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2937 3092
2938 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 } 3095 }
2941 3096
… …
2943 3098
2944 my @items = sort { 3099 my @items = sort {
2945 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2946 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2947 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2948 3105
2949 my $count = 10 + 1; 3106 my $count = 10 + 1;
2950 for my $item (@items) { 3107 for my $item (@items) {
2951 last unless --$count; 3108 last unless --$count;
2952 3109
… …
2967 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2971 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2972 can_events => 1, 3130 can_events => 1,
2973 can_hover => 1 3131 can_hover => 1
2974 }; 3132 };
3133
3134 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3135 $item->{label}{fg}[3] = $item->{label}{orig_alpha} * $diff / 2;
3136 if ($diff < 1) {
3137 $item->{label}{max_h} = $item->{label}{req_h} * $diff;
3138 $item->{label}->realloc;
3139 }
3140 $item->{label}->update;
3141 $self->{timer}->interval (1/30);
3142 }
2975 } 3143 }
2976 3144
2977 $self->clear; 3145 $self->clear;
2978 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2979} 3147}
… …
2984 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
2986 3154
2987 return unless $text; 3155 return unless $text;
2988 3156
2989 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990 3158
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992 3160
2993 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3024 3192
3025 $self->reorder; 3193 $self->reorder;
3026 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3027} 3195}
3028 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3029############################################################################# 3205#############################################################################
3030 3206
3031package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
3032 3208
3033our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3034
3035use CFClient::OpenGL;
3036 3210
3037sub new { 3211sub new {
3038 my $class = shift; 3212 my $class = shift;
3039 3213
3040 $class->SUPER::new ( 3214 my $self = $class->SUPER::new (
3215 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3216 @_,
3217 );
3218
3219 $self
3220}
3221
3222sub set_items {
3223 my ($self, $items) = @_;
3224
3225 $self->{child}->clear;
3226 return unless $items;
3227
3228 my @items = sort {
3229 ($a->{type} <=> $b->{type})
3230 or ($a->{name} cmp $b->{name})
3231 } @$items;
3232
3233 $self->{real_items} = \@items;
3234
3235 my $row = 0;
3236 for my $item (@items) {
3237 CFClient::Item::update_widgets $item;
3238
3239 $self->{child}->add (0, $row, $item->{face_widget});
3240 $self->{child}->add (1, $row, $item->{desc_widget});
3241 $self->{child}->add (2, $row, $item->{weight_widget});
3242
3243 $row++;
3244 }
3245}
3246
3247#############################################################################
3248
3249package CFClient::UI::BindEditor;
3250
3251our @ISA = CFClient::UI::FancyFrame::;
3252
3253sub new {
3254 my $class = shift;
3255
3256 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3257
3258 $self->add (my $vb = new CFClient::UI::VBox);
3259
3260
3261 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3262 text => "start recording",
3263 tooltip => "Start/Stops recording of actions."
3264 ."All subsequent actions after the recording started will be captured."
3265 ."The actions are displayed after the record was stopped."
3266 ."To bind the action you have to click on the 'Bind' button",
3267 on_activate => sub {
3268 unless ($self->{recording}) {
3269 $self->start;
3270 } else {
3271 $self->stop;
3272 }
3273 });
3274
3275 $vb->add (new CFClient::UI::Label text => "Actions:");
3276 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3277
3278 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3279 $vb->add (my $hb = new CFClient::UI::HBox);
3280 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3281 $hb->add (new CFClient::UI::Button
3282 text => "bind",
3283 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3284 on_activate => sub {
3285 $self->ask_for_bind;
3286 });
3287
3288 $vb->add (my $hb = new CFClient::UI::HBox);
3289 $hb->add (new CFClient::UI::Button
3290 text => "ok",
3291 expand => 1,
3292 tooltip => "This closes the binding editor and saves the binding",
3293 on_activate => sub {
3294 $self->hide;
3295 $self->commit;
3296 });
3297
3298 $hb->add (new CFClient::UI::Button
3299 text => "cancel",
3300 expand => 1,
3301 tooltip => "This closes the binding editor without saving",
3302 on_activate => sub {
3303 $self->hide;
3304 $self->{binding_cancel}->()
3305 if $self->{binding_cancel};
3306 });
3307
3308 $self->update_binding_widgets;
3309
3310 $self
3311}
3312
3313sub commit {
3314 my ($self) = @_;
3315 my ($mod, $sym, $cmds) = $self->get_binding;
3316 if ($sym != 0 && @$cmds > 0) {
3317 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3318 ."'. Don't forget 'Save Config'!");
3319 $self->{binding_change}->($mod, $sym, $cmds)
3320 if $self->{binding_change};
3321 } else {
3322 $::STATUSBOX->add ("No action bound, no key or action specified!");
3323 $self->{binding_cancel}->()
3324 if $self->{binding_cancel};
3325 }
3326}
3327
3328sub start {
3329 my ($self) = @_;
3330
3331 $self->{rec_btn}->set_text ("stop recording");
3332 $self->{recording} = 1;
3333 $self->clear_command_list;
3334 $::CONN->start_record if $::CONN;
3335}
3336
3337sub stop {
3338 my ($self) = @_;
3339
3340 $self->{rec_btn}->set_text ("start recording");
3341 $self->{recording} = 0;
3342
3343 my $rec;
3344 $rec = $::CONN->stop_record if $::CONN;
3345 return unless ref $rec eq 'ARRAY';
3346 $self->set_command_list ($rec);
3347}
3348
3349
3350sub ask_for_bind_and_commit {
3351 my ($self) = @_;
3352 $self->ask_for_bind (1);
3353}
3354
3355sub ask_for_bind {
3356 my ($self, $commit) = @_;
3357
3358 CFClient::Binder::open_binding_dialog (sub {
3359 my ($mod, $sym) = @_;
3360 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3361 $self->update_binding_widgets;
3362 $self->commit if $commit;
3363 });
3364}
3365
3366# $mod and $sym are the modifiers and key symbol
3367# $cmds is a array ref of strings (the commands)
3368# $cb is the callback that is executed on OK
3369# $ccb is the callback that is executed on CANCEL and
3370# when the binding was unsuccessful on OK
3371sub set_binding {
3372 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3373
3374 $self->clear_command_list;
3375 $self->{recording} = 0;
3376 $self->{rec_btn}->set_text ("start recording");
3377
3378 $self->{binding} = [$mod, $sym];
3379 $self->{commands} = $cmds;
3380
3381 $self->{binding_change} = $cb;
3382 $self->{binding_cancel} = $ccb;
3383
3384 $self->update_binding_widgets;
3385}
3386
3387# this is a shortcut method that asks for a binding
3388# and then just binds it.
3389sub do_quick_binding {
3390 my ($self, $cmds) = @_;
3391 $self->set_binding (undef, undef, $cmds, sub {
3392 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3393 });
3394 $self->ask_for_bind (1);
3395}
3396
3397sub update_binding_widgets {
3398 my ($self) = @_;
3399 my ($mod, $sym, $cmds) = $self->get_binding;
3400 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3401 $self->set_command_list ($cmds);
3402}
3403
3404sub get_binding {
3405 my ($self) = @_;
3406 return (
3407 $self->{binding}->[0],
3408 $self->{binding}->[1],
3409 [ grep { defined $_ } @{$self->{commands}} ]
3410 );
3411}
3412
3413sub clear_command_list {
3414 my ($self) = @_;
3415 $self->{cmdbox}->clear ();
3416}
3417
3418sub set_command_list {
3419 my ($self, $cmds) = @_;
3420
3421 $self->{cmdbox}->clear ();
3422 $self->{commands} = $cmds;
3423
3424 my $idx = 0;
3425
3426 for (@$cmds) {
3427 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3428
3429 my $i = $idx;
3430 $hb->add (new CFClient::UI::Label text => $_);
3431 $hb->add (new CFClient::UI::Button
3432 text => "delete",
3433 tooltip => "Deletes the action from the record",
3434 on_activate => sub {
3435 $self->{cmdbox}->remove ($hb);
3436 $cmds->[$i] = undef;
3437 });
3438
3439
3440 $idx++
3441 }
3442}
3443
3444#############################################################################
3445
3446package CFClient::UI::SpellList;
3447
3448our @ISA = CFClient::UI::Table::;
3449
3450sub new {
3451 my $class = shift;
3452
3453 my $self = $class->SUPER::new (
3454 binding => [],
3455 commands => [],
3041 @_, 3456 @_,
3042 ) 3457 )
3043} 3458}
3044 3459
3045sub configure { 3460# XXX: Do sorting? Argl...
3046 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
3047
3048 $self->{w} = $w;
3049 $self->{h} = $h;
3050}
3051
3052sub check_size {
3053 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3054 3464
3055 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3056 if $self->{w}; 3466 face => $spell->{face},
3467 can_hover => 1,
3468 can_events => 1,
3469 tooltip => $spell->{message});
3470
3471 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3472 text => $spell->{name},
3473 can_hover => 1,
3474 can_events => 1,
3475 tooltip => $spell->{message},
3476 expand => 1);
3477
3478 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3479 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3480 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3481 expand => 1);
3482
3483 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3484 text => "bind to key",
3485 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3486}
3487
3488sub rebuild_spell_list {
3489 my ($self) = @_;
3490 $self->{tbl_idx} = 0;
3491 $self->add_spell ($_) for values %{$self->{spells}};
3492}
3493
3494sub remove_spell {
3495 my ($self, $spell) = @_;
3496 delete $self->{spells}->{$spell->{name}};
3497 $self->rebuild_spell_list;
3498}
3499
3500#############################################################################
3501
3502package CFClient::UI::Root;
3503
3504our @ISA = CFClient::UI::Container::;
3505
3506use List::Util qw(min max);
3507
3508use CFClient::OpenGL;
3509
3510sub new {
3511 my $class = shift;
3512
3513 my $self = $class->SUPER::new (
3514 visible => 1,
3515 @_,
3516 );
3517
3518 Scalar::Util::weaken ($self->{root} = $self);
3519
3520 $self
3057} 3521}
3058 3522
3059sub size_request { 3523sub size_request {
3060 my ($self) = @_; 3524 my ($self) = @_;
3061 3525
3062 ($self->{w}, $self->{h}) 3526 ($self->{w}, $self->{h})
3527}
3528
3529sub _to_pixel {
3530 my ($coord, $size, $max) = @_;
3531
3532 $coord =
3533 $coord eq "center" ? ($max - $size) * 0.5
3534 : $coord eq "max" ? $max
3535 : $coord;
3536
3537 $coord = 0 if $coord < 0;
3538 $coord = $max - $size if $coord > $max - $size;
3539
3540 int $coord + 0.5
3063} 3541}
3064 3542
3065sub size_allocate { 3543sub size_allocate {
3066 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3067 3545
3068 for my $child ($self->children) { 3546 for my $child ($self->children) {
3069 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3547 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3070 3548
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3073 3551
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 3554
3080 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3081 } 3556 }
3082} 3557}
3083 3558
… …
3094} 3569}
3095 3570
3096sub update { 3571sub update {
3097 my ($self) = @_; 3572 my ($self) = @_;
3098 3573
3099 $self->check_size;
3100 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3101} 3575}
3102 3576
3103sub add { 3577sub add {
3104 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3105 3579
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3114 3581 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 3582
3120 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3121} 3584}
3122 3585
3123sub remove { 3586sub remove {
3124 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3125 3588
3126 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3127 3593
3128 while (@children) { 3594 while (@children) {
3129 my $w = pop @children; 3595 my $w = pop @children;
3130 push @children, $w->children; 3596 push @children, $w->children;
3131 $w->set_invisible; 3597 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3151 $_->() 3617 $_->()
3152 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3153 } 3619 }
3154 3620
3155 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3156 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3157 3625
3158 for (;;) { 3626 outer:
3159 if ($self->{check_size}) { 3627 while () {
3160 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3162 for values %{delete $self->{check_size}} 3630 $widget->{visible} or next; # do not resize invisible widgets
3631
3632 $queue{$widget+0}++ and next; # duplicates are common
3633
3634 push @{ $queue[$widget->{visible}] }, $widget;
3635 }
3163 } 3636 }
3164 3637
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3166 3640
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 3642 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 3643
3644 pop @queue;
3645 }
3646
3647 delete $queue{$widget+0};
3648
3649 my ($w, $h) = $widget->size_request;
3650
3651 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3652 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3653
3654 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3655 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3656
3657 $w = $widget->{force_w} if exists $widget->{force_w};
3658 $h = $widget->{force_h} if exists $widget->{force_h};
3659
3660 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3661 || delete $widget->{force_realloc}) {
3175 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3177 3664
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3179 3666
3180 $widget->{parent}->check_size
3181 if $widget->{parent}; 3667 if (my $parent = $widget->{parent}) {
3668 $self->{realloc}{$parent+0} = $parent
3669 unless $queue{$parent+0};
3670
3671 $parent->{force_size_alloc} = 1;
3672 $self->{size_alloc}{$parent+0} = $parent;
3673 }
3182 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3183 } 3677 }
3184 } 3678 }
3185 3679
3186 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3188 my ($widget, $w, $h) = @$_; 3682 values %$size_alloc;
3683
3684 while () {
3685 my $widget = pop @queue || last;
3686
3687 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3189 3688
3190 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3191 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3192 3691
3692 $w = int $w + 0.5;
3693 $h = int $h + 0.5;
3694
3695 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3696 $widget->{old_w} = $widget->{w};
3697 $widget->{old_h} = $widget->{h};
3698
3193 $widget->{w} = $w; 3699 $widget->{w} = $w;
3194 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3195 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3196 } 3704 }
3197 } 3705 }
3198 3706
3199 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3200 $_->() 3708 $_->()
3201 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3202 } 3710 }
3711
3203 3712
3204 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3205 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3206 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3207 3716
… …
3209 glLoadIdentity; 3718 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 3721 glLoadIdentity;
3213 3722
3723 {
3724 package CFClient::UI::Base;
3725
3726 ($draw_x, $draw_y, $draw_w, $draw_h) =
3727 (0, 0, $self->{w}, $self->{h});
3728 }
3729
3214 $self->_draw; 3730 $self->_draw;
3215} 3731}
3216 3732
3217############################################################################# 3733#############################################################################
3218 3734

Diff Legend

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