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.231 by root, Thu May 25 00:26:19 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
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
238 $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;
239} 305}
240 306
241sub hide { 307sub hide {
242 my ($self) = @_; 308 my ($self) = @_;
243 309
… …
245 311
246 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
247 if $self->{parent}; 313 if $self->{parent};
248} 314}
249 315
250sub move { 316sub move_abs {
251 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
252 318
253 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
254 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
255 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
256 322
257 $self->update; 323 $self->update;
258} 324}
259 325
260sub set_size { 326sub set_size {
261 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
262 328
263 $self->{user_w} = $w; 329 $self->{force_w} = $w;
264 $self->{user_h} = $h; 330 $self->{force_h} = $h;
265 331
266 $self->check_size; 332 $self->realloc;
267} 333}
268 334
269sub size_request { 335sub size_request {
270 require Carp; 336 require Carp;
271 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
273 339
274sub configure { 340sub configure {
275 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
276 342
277 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
278 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
279 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
280 348
281 # use alignment to adjust x, y 349 # use alignment to adjust x, y
282 350
283 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
284 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
285
286 ($w, $h) = ($w2, $h2);
287 } 353 }
288 354
289 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
290 $self->{x} = $x; 356 $self->{x} = $x;
291 $self->{y} = $y; 357 $self->{y} = $y;
292 $self->update; 358 $self->update;
293 } 359 }
294 360
295 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
296 $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;
297 } 368 }
298} 369}
299 370
300sub size_allocate { 371sub size_allocate {
301 # nothing to be done 372 # nothing to be done
302} 373}
303 374
304sub reconfigure {
305 my ($self) = @_;
306
307 $self->check_size (1);
308 $self->update;
309}
310
311sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
312} 381}
313 382
314sub set_max_size { 383sub set_max_size {
315 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
316 385
317 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
318 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;
319} 390}
320 391
321sub set_tooltip { 392sub set_tooltip {
322 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
323 399
324 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
325 401
326 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
327 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
… …
370 446
371 $::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
372 unless $FOCUS; 448 unless $FOCUS;
373} 449}
374 450
375sub mouse_motion { } 451sub mouse_motion { 0 }
376sub button_up { } 452sub button_up { 0 }
377sub key_down { } 453sub key_down { 0 }
378sub key_up { } 454sub key_up { 0 }
379 455
380sub button_down { 456sub button_down {
381 my ($self, $ev, $x, $y) = @_; 457 my ($self, $ev, $x, $y) = @_;
382 458
383 $self->focus_in; 459 $self->focus_in;
384}
385 460
386sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 461 0
387sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 462}
388sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 463
389sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 464sub find_widget {
390sub 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
391 537
392sub draw { 538sub draw {
393 my ($self) = @_; 539 my ($self) = @_;
394 540
395 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);
396 552
397 glPushMatrix; 553 glPushMatrix;
398 glTranslate $self->{x}, $self->{y}, 0; 554 glTranslate $self->{x}, $self->{y}, 0;
399 $self->_draw;
400 glPopMatrix;
401 555
402 if ($self == $HOVER && $self->{can_hover}) { 556 if ($self == $HOVER && $self->{can_hover}) {
403 my ($x, $y) = @$self{qw(x y)};
404
405 glColor 1, 0.8, 0.5, 0.2; 557 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
406 glEnable GL_BLEND; 558 glEnable GL_BLEND;
407 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 559 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
408 glBegin GL_QUADS; 560 glBegin GL_QUADS;
409 glVertex $x , $y;
410 glVertex $x + $self->{w}, $y;
411 glVertex $x + $self->{w}, $y + $self->{h};
412 glVertex $x , $y + $self->{h};
413 glEnd;
414 glDisable GL_BLEND;
415 }
416
417 if ($ENV{PCLIENT_DEBUG}) {
418 glPushMatrix;
419 glColor 1, 1, 0, 1;
420 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
421 glBegin GL_LINE_LOOP;
422 glVertex 0 , 0; 561 glVertex 0 , 0;
423 glVertex $self->{w}, 0; 562 glVertex $self->{w}, 0;
424 glVertex $self->{w}, $self->{h}; 563 glVertex $self->{w}, $self->{h};
425 glVertex 0 , $self->{h}; 564 glVertex 0 , $self->{h};
426 glEnd; 565 glEnd;
566 glDisable GL_BLEND;
567 }
568
569 if ($ENV{CFPLUS_DEBUG} & 1) {
570 glPushMatrix;
571 glColor 1, 1, 0, 1;
572 glTranslate 0.375, 0.375;
573 glBegin GL_LINE_LOOP;
574 glVertex 0 , 0;
575 glVertex $self->{w} - 1, 0;
576 glVertex $self->{w} - 1, $self->{h} - 1;
577 glVertex 0 , $self->{h} - 1;
578 glEnd;
427 glPopMatrix; 579 glPopMatrix;
428 #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;
429 } 581 }
582
583 $self->_draw;
584 glPopMatrix;
430} 585}
431 586
432sub _draw { 587sub _draw {
433 my ($self) = @_; 588 my ($self) = @_;
434 589
435 warn "no draw defined for $self\n"; 590 warn "no draw defined for $self\n";
436}
437
438sub find_widget {
439 my ($self, $x, $y) = @_;
440
441 return () unless $self->{can_events};
442
443 return $self
444 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
445 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
446
447 ()
448}
449
450sub set_parent {
451 my ($self, $parent) = @_;
452
453 Scalar::Util::weaken ($self->{parent} = $parent);
454
455 # TODO: req_w _does_change after ->reconfigure
456 $self->check_size
457 unless exists $self->{req_w};
458
459 $self->show;
460}
461
462sub check_size {
463 my ($self, $forced) = @_;
464
465 $self->{force_alloc} = 1 if $forced;
466 $CFClient::UI::ROOT->{check_size}{$self} = $self;
467}
468
469sub update {
470 my ($self) = @_;
471
472 $self->{parent}->update
473 if $self->{parent};
474}
475
476sub connect {
477 my ($self, $signal, $cb) = @_;
478
479 push @{ $self->{signal_cb}{$signal} }, $cb;
480}
481
482sub _emit {
483 my ($self, $signal, @args) = @_;
484
485 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
486}
487
488sub emit {
489 my ($self, $signal, @args) = @_;
490
491 $self->_emit ($signal, @args)
492 || $self->$signal (@args);
493} 591}
494 592
495sub DESTROY { 593sub DESTROY {
496 my ($self) = @_; 594 my ($self) = @_;
497 595
… …
529 627
530 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
531 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
532 630
533 glEnable GL_BLEND; 631 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glColor @$color; 633 glColor_premultiply @$color;
536 634
537 glBegin GL_QUADS; 635 glBegin GL_QUADS;
538 glVertex 0 , 0; 636 glVertex 0 , 0;
539 glVertex 0 , $h; 637 glVertex 0 , $h;
540 glVertex $w, $h; 638 glVertex $w, $h;
… …
555 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
556 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
557} 655}
558 656
559sub size_request { 657sub size_request {
560 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
561} 661}
562 662
563sub draw { } 663sub draw { }
564 664
565############################################################################# 665#############################################################################
… …
569our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
570 670
571sub new { 671sub new {
572 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
573 673
574 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
575 675
576 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
577 children => [], 677 children => [],
578 can_events => 0, 678 can_events => 0,
579 %arg, 679 %arg,
580 ); 680 );
681
581 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
582 684
583 $self 685 $self
584} 686}
585 687
586sub add { 688sub add {
… …
594 $self->{children} = [ 696 $self->{children} = [
595 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
596 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
597 ]; 699 ];
598 700
599 $self->check_size (1); 701 $self->realloc;
600 $self->update;
601} 702}
602 703
603sub children { 704sub children {
604 @{ $_[0]{children} } 705 @{ $_[0]{children} }
605} 706}
… …
610 delete $child->{parent}; 711 delete $child->{parent};
611 $child->hide; 712 $child->hide;
612 713
613 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
614 715
615 $self->check_size; 716 $self->realloc;
616 $self->update;
617} 717}
618 718
619sub clear { 719sub clear {
620 my ($self) = @_; 720 my ($self) = @_;
621 721
… …
625 for (@$children) { 725 for (@$children) {
626 delete $_->{parent}; 726 delete $_->{parent};
627 $_->hide; 727 $_->hide;
628 } 728 }
629 729
630 $self->check_size; 730 $self->realloc;
631 $self->update;
632} 731}
633 732
634sub find_widget { 733sub find_widget {
635 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
636 735
637 $x -= $self->{x}; 736 $x -= $self->{x};
638 $y -= $self->{y}; 737 $y -= $self->{y};
639 738
640 my $res; 739 my $res;
641 740
642 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
643 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
644 and return $res; 743 and return $res;
645 } 744 }
646 745
647 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
696 $self->{children}[0]->configure (0, 0, $w, $h); 795 $self->{children}[0]->configure (0, 0, $w, $h);
697} 796}
698 797
699############################################################################# 798#############################################################################
700 799
800# back-buffered drawing area
801
701package CFClient::UI::Window; 802package CFClient::UI::Window;
702 803
703our @ISA = CFClient::UI::Bin::; 804our @ISA = CFClient::UI::Bin::;
704 805
705use CFClient::OpenGL; 806use CFClient::OpenGL;
… …
723 $self->SUPER::size_allocate ($w, $h); 824 $self->SUPER::size_allocate ($w, $h);
724 $self->update; 825 $self->update;
725} 826}
726 827
727sub _render { 828sub _render {
829 my ($self) = @_;
830
728 $_[0]{children}[0]->draw; 831 $self->{children}[0]->draw;
729} 832}
730 833
731sub render_child { 834sub render_child {
732 my ($self) = @_; 835 my ($self) = @_;
733 836
734 $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 {
735 glClearColor 0, 0, 0, 0; 838 glClearColor 0, 0, 0, 0;
736 glClear GL_COLOR_BUFFER_BIT; 839 glClear GL_COLOR_BUFFER_BIT;
737 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
738 $self->_render; 848 $self->_render;
739 }; 849 };
740} 850}
741 851
742sub _draw { 852sub _draw {
743 my ($self) = @_; 853 my ($self) = @_;
744 854
745 my ($w, $h) = ($self->w, $self->h); 855 my ($w, $h) = @$self{qw(w h)};
746 856
747 my $tex = $self->{texture} 857 my $tex = $self->{texture}
748 or return; 858 or return;
749 859
750 glEnable GL_TEXTURE_2D; 860 glEnable GL_TEXTURE_2D;
751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 861 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
752 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
753 863
754 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
755 865
756 glDisable GL_TEXTURE_2D; 866 glDisable GL_TEXTURE_2D;
757} 867}
… …
760 870
761package CFClient::UI::ViewPort; 871package CFClient::UI::ViewPort;
762 872
763our @ISA = CFClient::UI::Window::; 873our @ISA = CFClient::UI::Window::;
764 874
875sub new {
876 my $class = shift;
877
878 $class->SUPER::new (
879 scroll_x => 0,
880 scroll_y => 1,
881 @_,
882 )
883}
884
765sub size_request { 885sub size_request {
766 my ($self) = @_; 886 my ($self) = @_;
767 887
768 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 888 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
769 889
770 @$self{qw(child_w child_h)} 890 $w = 10 if $self->{scroll_x};
891 $h = 10 if $self->{scroll_y};
892
893 ($w, $h)
771} 894}
772 895
773sub size_allocate { 896sub size_allocate {
774 my ($self, $w, $h) = @_; 897 my ($self, $w, $h) = @_;
775 898
776 my ($cw, $ch) = @$self{qw(child_w child_h)}; 899 my $child = $self->child;
777# $w = $self->{w}; 900
901 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
902 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
903
778 $self->child->configure (0, 0, $cw, $ch); 904 $self->child->configure (0, 0, $w, $h);
779 $self->update; 905 $self->update;
780} 906}
781 907
782sub set_offset { 908sub set_offset {
783 my ($self, $x, $y) = @_; 909 my ($self, $x, $y) = @_;
… …
817} 943}
818 944
819sub _render { 945sub _render {
820 my ($self) = @_; 946 my ($self) = @_;
821 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
822 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 951 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
823 952
824 $self->SUPER::_render; 953 $self->SUPER::_render;
825} 954}
826 955
… …
829package CFClient::UI::ScrolledWindow; 958package CFClient::UI::ScrolledWindow;
830 959
831our @ISA = CFClient::UI::HBox::; 960our @ISA = CFClient::UI::HBox::;
832 961
833sub new { 962sub new {
834 my $class = shift; 963 my ($class, %arg) = @_;
964
965 my $child = delete $arg{child};
835 966
836 my $self; 967 my $self;
837 968
838 my $slider = new CFClient::UI::Slider 969 my $slider = new CFClient::UI::Slider
839 vertical => 1, 970 vertical => 1,
840 range => [0, 0, 1, 0.01], # HACK fix 971 range => [0, 0, 1, 0.01], # HACK fix
841 connect_changed => sub { 972 on_changed => sub {
842 $self->{vp}->set_offset (0, $_[1]); 973 $self->{vp}->set_offset (0, $_[1]);
843 }, 974 },
844 ; 975 ;
845 976
846 $self = $class->SUPER::new ( 977 $self = $class->SUPER::new (
847 vp => (new CFClient::UI::ViewPort expand => 1), 978 vp => (new CFClient::UI::ViewPort expand => 1),
848 slider => $slider, 979 slider => $slider,
849 @_, 980 %arg,
850 ); 981 );
851 982
852 $self->{vp}->add ($self->{scrolled});
853 $self->add ($self->{vp});
854 $self->add ($self->{slider}); 983 $self->SUPER::add ($self->{vp}, $self->{slider});
984 $self->add ($child) if $child;
855 985
856 $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]);
857} 1003}
858 1004
859sub size_allocate { 1005sub size_allocate {
860 my ($self, $w, $h) = @_; 1006 my ($self, $w, $h) = @_;
861 1007
… …
890 1036
891 if ($self->{bg}) { 1037 if ($self->{bg}) {
892 my ($w, $h) = @$self{qw(w h)}; 1038 my ($w, $h) = @$self{qw(w h)};
893 1039
894 glEnable GL_BLEND; 1040 glEnable GL_BLEND;
895 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1041 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
896 glColor @{ $self->{bg} }; 1042 glColor_premultiply @{ $self->{bg} };
897 1043
898 glBegin GL_QUADS; 1044 glBegin GL_QUADS;
899 glVertex 0 , 0; 1045 glVertex 0 , 0;
900 glVertex 0 , $h; 1046 glVertex 0 , $h;
901 glVertex $w, $h; 1047 glVertex $w, $h;
… …
914 1060
915our @ISA = CFClient::UI::Bin::; 1061our @ISA = CFClient::UI::Bin::;
916 1062
917use CFClient::OpenGL; 1063use CFClient::OpenGL;
918 1064
919my @tex = 1065my $bg =
1066 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1067 mipmap => 1, wrap => 1;
1068
1069my @border =
920 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1070 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
921 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);
922 1072
923sub new { 1073sub new {
924 my $class = shift; 1074 my ($class, %arg) = @_;
925 1075
926 # TODO: user_x, user_y, overwrite moveto? 1076 my $title = delete $arg{title};
927 1077
928 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
929 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
930 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
931 border => 0.6, 1081 border => 0.6,
932 is_toplevel => 1,
933 can_events => 1, 1082 can_events => 1,
934 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
935 ); 1086 );
936 1087
937 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title} = new CFClient::UI::Label
938 align => 0, 1089 align => 0,
939 valign => 1, 1090 valign => 1,
940 text => $self->{title}, 1091 text => $title,
941 fontsize => $self->{border}; 1092 fontsize => $self->{border}
1093 if defined $title;
942 1094
943 $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};
944} 1103}
945 1104
946sub border { 1105sub border {
947 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
948} 1107}
949 1108
950sub size_request { 1109sub size_request {
951 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title}->size_request
1113 if $self->{title};
952 1114
953 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
954 1116
955 ( 1117 (
956 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
959} 1121}
960 1122
961sub size_allocate { 1123sub size_allocate {
962 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
963 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
964 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
965 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
966 1136
967 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
968 if $self->{title};
969
970 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
971} 1138}
972 1139
973sub button_down { 1140sub button_down {
974 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
975 1142
… …
991 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
992 1159
993 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
994 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
995 1162
996 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
997 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
998 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
999 $self->check_size; 1167 $self->realloc;
1000 }; 1168 };
1001 1169
1002 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1003 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1004 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1006 $self->{motion} = sub { 1174 $self->{motion} = sub {
1007 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1008 1176
1009 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1010 1178
1011 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1012 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1013 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1014 } 1187 1
1015} 1188}
1016 1189
1017sub button_up { 1190sub button_up {
1018 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1019 1192
1020 delete $self->{motion}; 1193 !!delete $self->{motion}
1021} 1194}
1022 1195
1023sub mouse_motion { 1196sub mouse_motion {
1024 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1025 1198
1026 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1027} 1202}
1028 1203
1029sub _draw { 1204sub _draw {
1030 my ($self) = @_; 1205 my ($self) = @_;
1031 1206
1207 my $child = $self->{children}[0];
1208
1032 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1033 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1034 1211
1035 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1036 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1037 1214
1038 my $border = $self->border; 1215 my $border = $self->border;
1039 1216
1040 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1041 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1042 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1043 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1044 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1045 1222
1046 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1047 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1048 1225
1049 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1050 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1051 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1052
1053 glColor @{ $self->{bg} };
1054
1055 $bg->{s} = $rep_x;
1056 $bg->{t} = $rep_y;
1057 $bg->{wrap_mode} = 1;
1058 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1059 } 1231 }
1060 1232
1061 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1062 1234
1063 $self->{title}->draw if $self->{title};
1064
1065 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title}->_draw;
1240 }
1066} 1241}
1067 1242
1068############################################################################# 1243#############################################################################
1069 1244
1070package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1078sub new { 1253sub new {
1079 my $class = shift; 1254 my $class = shift;
1080 1255
1081 $class->SUPER::new ( 1256 $class->SUPER::new (
1082 col_expand => [], 1257 col_expand => [],
1083 @_ 1258 @_,
1084 ) 1259 )
1260}
1261
1262sub children {
1263 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1085} 1264}
1086 1265
1087sub add { 1266sub add {
1088 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1089 1268
1090 $child->set_parent ($self); 1269 $child->set_parent ($self);
1091 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1092 1271
1093 $child->check_size; 1272 $self->realloc;
1094} 1273}
1095 1274
1096sub children {
1097 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1098}
1099
1100# 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?
1101sub clear { 1276sub clear {
1102 my ($self) = @_; 1277 my ($self) = @_;
1103 1278
1104 my @children = $self->children; 1279 my @children = $self->children;
1105 delete $self->{children}; 1280 delete $self->{children};
… …
1107 for (@children) { 1282 for (@children) {
1108 delete $_->{parent}; 1283 delete $_->{parent};
1109 $_->hide; 1284 $_->hide;
1110 } 1285 }
1111 1286
1112 $self->update; 1287 $self->realloc;
1113} 1288}
1114 1289
1115sub get_wh { 1290sub get_wh {
1116 my ($self) = @_; 1291 my ($self) = @_;
1117 1292
… …
1148sub size_allocate { 1323sub size_allocate {
1149 my ($self, $w, $h) = @_; 1324 my ($self, $w, $h) = @_;
1150 1325
1151 my ($ws, $hs) = $self->get_wh; 1326 my ($ws, $hs) = $self->get_wh;
1152 1327
1153 my $req_w = sum @$ws; 1328 my $req_w = (sum @$ws) || 1;
1154 my $req_h = sum @$hs; 1329 my $req_h = (sum @$hs) || 1;
1155 1330
1156 # TODO: nicer code && do row_expand 1331 # TODO: nicer code && do row_expand
1157 my @col_expand = @{$self->{col_expand}}; 1332 my @col_expand = @{$self->{col_expand}};
1158 @col_expand = (1) x @$ws unless @col_expand; 1333 @col_expand = (1) x @$ws unless @col_expand;
1159 my $col_expand = (sum @col_expand) || 1; 1334 my $col_expand = (sum @col_expand) || 1;
… …
1213 } 1388 }
1214} 1389}
1215 1390
1216############################################################################# 1391#############################################################################
1217 1392
1218package CFClient::UI::HBox; 1393package CFClient::UI::Box;
1219
1220# TODO: wrap into common Box base class
1221 1394
1222our @ISA = CFClient::UI::Container::; 1395our @ISA = CFClient::UI::Container::;
1223 1396
1224sub size_request { 1397sub size_request {
1225 my ($self) = @_; 1398 my ($self) = @_;
1226 1399
1227 my @alloc = map [$_->size_request], @{$self->{children}}; 1400 $self->{vertical}
1228 1401 ? (
1229 ( 1402 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1230 (List::Util::sum map $_->[0], @alloc), 1403 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1231 (List::Util::max map $_->[1], @alloc), 1404 )
1232 ) 1405 : (
1406 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1407 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1408 )
1233} 1409}
1234 1410
1235sub size_allocate { 1411sub size_allocate {
1236 my ($self, $w, $h) = @_; 1412 my ($self, $w, $h) = @_;
1237 1413
1238 ($h, $w) = ($w, $h); 1414 my $space = $self->{vertical} ? $h : $w;
1239
1240 my $children = $self->{children}; 1415 my $children = $self->{children};
1241 1416
1242 my @h = map $_->{req_w}, @$children; 1417 my @req;
1243 1418
1244 my $req_h = List::Util::sum @h; 1419 if ($self->{homogeneous}) {
1245 1420 @req = ($space / (@$children || 1)) x @$children;
1246 if ($req_h > $h) {
1247 # ah well, not enough space
1248 $_ *= $h / $req_h for @h;
1249 } 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 {
1250 my $exp = List::Util::sum map $_->{expand}, @$children; 1429 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1251 $exp ||= 1;
1252 1430
1431 $space = ($space - $req) / $expand; # remaining space to give away
1432
1433 $req[$_] += $space * $children->[$_]{expand}
1253 for (0 .. $#$children) { 1434 for 0 .. $#$children;
1254 my $child = $children->[$_];
1255
1256 my $alloc_h = $h[$_];
1257 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1258 $h[$_] = $alloc_h;
1259 } 1435 }
1260 } 1436 }
1261 1437
1262 CFClient::UI::harmonize \@h; 1438 CFClient::UI::harmonize \@req;
1263 1439
1264 my $y = 0; 1440 my $pos = 0;
1265 for (0 .. $#$children) { 1441 for (0 .. $#$children) {
1266 my $child = $children->[$_];
1267 my $h = $h[$_]; 1442 my $alloc = $req[$_];
1268 $child->configure ($y, 0, $h, $w); 1443 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1269 1444
1270 $y += $h; 1445 $pos += $alloc;
1271 } 1446 }
1272 1447
1273 1 1448 1
1274} 1449}
1275 1450
1276############################################################################# 1451#############################################################################
1277 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
1278package CFClient::UI::VBox; 1468package CFClient::UI::VBox;
1279 1469
1280# TODO: wrap into common Box base class
1281
1282our @ISA = CFClient::UI::Container::; 1470our @ISA = CFClient::UI::Box::;
1283 1471
1284sub size_request { 1472sub new {
1285 my ($self) = @_; 1473 my $class = shift;
1286 1474
1287 my @alloc = map [$_->size_request], @{$self->{children}}; 1475 $class->SUPER::new (
1288 1476 vertical => 1,
1289 ( 1477 @_,
1290 (List::Util::max map $_->[0], @alloc),
1291 (List::Util::sum map $_->[1], @alloc),
1292 ) 1478 )
1293}
1294
1295sub size_allocate {
1296 my ($self, $w, $h) = @_;
1297
1298 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1299
1300 my $children = $self->{children};
1301
1302 my @h = map $_->{req_h}, @$children;
1303
1304 my $req_h = List::Util::sum @h;
1305
1306 if ($req_h > $h) {
1307 # ah well, not enough space
1308 $_ *= $h / $req_h for @h;
1309 } else {
1310 my $exp = List::Util::sum map $_->{expand}, @$children;
1311 $exp ||= 1;
1312
1313 for (0 .. $#$children) {
1314 my $child = $children->[$_];
1315
1316 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1317 }
1318 }
1319
1320 CFClient::UI::harmonize \@h;
1321
1322 my $y = 0;
1323 for (0 .. $#$children) {
1324 my $child = $children->[$_];
1325 my $h = $h[$_];
1326 $child->configure (0, $y, $w, $h);
1327
1328 $y += $h;
1329 }
1330
1331 1
1332} 1479}
1333 1480
1334############################################################################# 1481#############################################################################
1335 1482
1336package CFClient::UI::Label; 1483package CFClient::UI::Label;
… …
1353 ellipsise => 3, # end 1500 ellipsise => 3, # end
1354 layout => (new CFClient::Layout), 1501 layout => (new CFClient::Layout),
1355 fontsize => 1, 1502 fontsize => 1,
1356 align => -1, 1503 align => -1,
1357 valign => -1, 1504 valign => -1,
1358 padding => 2, 1505 padding_x => 2,
1506 padding_y => 2,
1359 can_events => 0, 1507 can_events => 0,
1360 %arg 1508 %arg
1361 ); 1509 );
1362 1510
1363 if (exists $self->{template}) { 1511 if (exists $self->{template}) {
… …
1399 $self->{text} = "T$text"; 1547 $self->{text} = "T$text";
1400 1548
1401 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1549 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1402 $self->{layout}->set_text ($text); 1550 $self->{layout}->set_text ($text);
1403 1551
1552 $self->realloc;
1404 $self->update; 1553 $self->update;
1405 $self->check_size;
1406} 1554}
1407 1555
1408sub set_markup { 1556sub set_markup {
1409 my ($self, $markup) = @_; 1557 my ($self, $markup) = @_;
1410 1558
… …
1414 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1562 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1415 1563
1416 $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;
1417 $self->{layout}->set_markup ($markup); 1565 $self->{layout}->set_markup ($markup);
1418 1566
1567 $self->realloc;
1419 $self->update; 1568 $self->update;
1420 $self->check_size;
1421} 1569}
1422 1570
1423sub size_request { 1571sub size_request {
1424 my ($self) = @_; 1572 my ($self) = @_;
1425 1573
… …
1439 1587
1440 $w = List::Util::max $w, $w2; 1588 $w = List::Util::max $w, $w2;
1441 $h = List::Util::max $h, $h2; 1589 $h = List::Util::max $h, $h2;
1442 } 1590 }
1443 1591
1444 ( 1592 ($w, $h)
1445 $w + $self->{padding} * 2,
1446 $h + $self->{padding} * 2,
1447 )
1448} 1593}
1449 1594
1450sub size_allocate { 1595sub size_allocate {
1451 my ($self, $w, $h) = @_; 1596 my ($self, $w, $h) = @_;
1452 1597
1598 delete $self->{ox};
1599
1453 delete $self->{texture}; 1600 delete $self->{texture}
1601 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1454} 1602}
1455 1603
1456sub set_fontsize { 1604sub set_fontsize {
1457 my ($self, $fontsize) = @_; 1605 my ($self, $fontsize) = @_;
1458 1606
1459 $self->{fontsize} = $fontsize; 1607 $self->{fontsize} = $fontsize;
1460 delete $self->{texture}; 1608 delete $self->{texture};
1461 1609
1462 $self->update; 1610 $self->realloc;
1463 $self->check_size;
1464} 1611}
1465 1612
1466sub _draw { 1613sub _draw {
1467 my ($self) = @_; 1614 my ($self) = @_;
1468 1615
… …
1474 $self->{layout}->set_width ($self->{w}); 1621 $self->{layout}->set_width ($self->{w});
1475 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1622 $self->{layout}->set_ellipsise ($self->{ellipsise});
1476 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1623 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1477 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1478 1625
1479 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1626 new_from_layout CFClient::Texture $self->{layout}
1627 };
1480 1628
1629 unless (exists $self->{ox}) {
1481 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1630 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1482 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1631 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1483 : ($self->{w} - $tex->{w}) * 0.5); 1632 : ($self->{w} - $tex->{w}) * 0.5);
1484 1633
1485 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1634 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1486 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1635 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1487 : ($self->{h} - $tex->{h}) * 0.5); 1636 : ($self->{h} - $tex->{h}) * 0.5);
1488
1489 $tex
1490 }; 1637 };
1491 1638
1492 glEnable GL_TEXTURE_2D; 1639 glEnable GL_TEXTURE_2D;
1493 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1640 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1494 1641
1642 glColor_premultiply @{$self->{fg}}
1495 if ($tex->{format} == GL_ALPHA) { 1643 if $tex->{format} == GL_ALPHA;
1496 glColor @{$self->{fg}}; 1644
1497 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1498 } else {
1499 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1645 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1500 }
1501 1646
1502 glDisable GL_TEXTURE_2D; 1647 glDisable GL_TEXTURE_2D;
1503} 1648}
1504 1649
1505############################################################################# 1650#############################################################################
… …
1532 1677
1533 delete $self->{cur_h}; 1678 delete $self->{cur_h};
1534 1679
1535 return if $self->{text} eq $text; 1680 return if $self->{text} eq $text;
1536 1681
1537 delete $self->{texture};
1538
1539 $self->{last_activity} = $::NOW; 1682 $self->{last_activity} = $::NOW;
1540 $self->{text} = $text; 1683 $self->{text} = $text;
1541 1684
1542 $text =~ s/./*/g if $self->{hidden}; 1685 $text =~ s/./*/g if $self->{hidden};
1543 $self->{layout}->set_text ("$text "); 1686 $self->{layout}->set_text ("$text ");
1544 1687
1545 $self->_emit (changed => $self->{text}); 1688 $self->_emit (changed => $self->{text});
1689 $self->update;
1546} 1690}
1547 1691
1548sub set_text { 1692sub set_text {
1549 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1550 1694
1551 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1552 $self->_set_text ($text); 1696 $self->_set_text ($text);
1553 $self->update; 1697
1554 $self->check_size; 1698 $self->realloc;
1555} 1699}
1556 1700
1557sub get_text { 1701sub get_text {
1558 $_[0]{text} 1702 $_[0]{text}
1559} 1703}
… …
1562 my ($self) = @_; 1706 my ($self) = @_;
1563 1707
1564 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1565 1709
1566 ($w + 1, $h) # add 1 for cursor 1710 ($w + 1, $h) # add 1 for cursor
1567}
1568
1569sub size_allocate {
1570 my ($self, $w, $h) = @_;
1571
1572 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1573} 1711}
1574 1712
1575sub key_down { 1713sub key_down {
1576 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1577 1715
… …
1595 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1596 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1597 $self->_emit ('escape'); 1735 $self->_emit ('escape');
1598 } elsif ($uni) { 1736 } elsif ($uni) {
1599 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1600 } 1740 }
1601 1741
1602 $self->_set_text ($text); 1742 $self->_set_text ($text);
1603 $self->update; 1743
1604 $self->check_size; 1744 $self->realloc;
1745
1746 1
1605} 1747}
1606 1748
1607sub focus_in { 1749sub focus_in {
1608 my ($self) = @_; 1750 my ($self) = @_;
1609 1751
… …
1624 utf8::encode $text; 1766 utf8::encode $text;
1625 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1626 1768
1627 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1628 $self->update; 1770 $self->update;
1771
1772 1
1629} 1773}
1630 1774
1631sub mouse_motion { 1775sub mouse_motion {
1632 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1633# 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
1634} 1780}
1635 1781
1636sub _draw { 1782sub _draw {
1637 my ($self) = @_; 1783 my ($self) = @_;
1638 1784
1639 local $self->{fg} = $self->{fg}; 1785 local $self->{fg} = $self->{fg};
1640 1786
1641 if ($FOCUS == $self) { 1787 if ($FOCUS == $self) {
1642 glColor @{$self->{active_bg}}; 1788 glColor_premultiply @{$self->{active_bg}};
1643 $self->{fg} = $self->{active_fg}; 1789 $self->{fg} = $self->{active_fg};
1644 } else { 1790 } else {
1645 glColor @{$self->{bg}}; 1791 glColor_premultiply @{$self->{bg}};
1646 } 1792 }
1647 1793
1648 glEnable GL_BLEND; 1794 glEnable GL_BLEND;
1649 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1795 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1650 glBegin GL_QUADS; 1796 glBegin GL_QUADS;
1651 glVertex 0 , 0; 1797 glVertex 0 , 0;
1652 glVertex 0 , $self->{h}; 1798 glVertex 0 , $self->{h};
1653 glVertex $self->{w}, $self->{h}; 1799 glVertex $self->{w}, $self->{h};
1654 glVertex $self->{w}, 0; 1800 glVertex $self->{w}, 0;
… …
1715 } else { 1861 } else {
1716 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1717 } 1863 }
1718 1864
1719 } else { 1865 } else {
1720 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1721 } 1869 1
1722
1723} 1870}
1724 1871
1725############################################################################# 1872#############################################################################
1726 1873
1727package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1736 1883
1737sub new { 1884sub new {
1738 my $class = shift; 1885 my $class = shift;
1739 1886
1740 $class->SUPER::new ( 1887 $class->SUPER::new (
1741 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1742 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1743 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1744 can_hover => 1, 1892 can_hover => 1,
1745 align => 0, 1893 align => 0,
1746 valign => 0, 1894 valign => 0,
… …
1755 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1756 1904
1757 $self->emit ("activate") 1905 $self->emit ("activate")
1758 if $x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1759 && $y >= 0 && $y < $self->{h}; 1907 && $y >= 0 && $y < $self->{h};
1908
1909 1
1760} 1910}
1761 1911
1762sub _draw { 1912sub _draw {
1763 my ($self) = @_; 1913 my ($self) = @_;
1764 1914
1765 local $self->{fg} = $self->{fg}; 1915 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1766
1767 if ($GRAB == $self) {
1768 $self->{fg} = $self->{active_fg};
1769 }
1770 1916
1771 glEnable GL_TEXTURE_2D; 1917 glEnable GL_TEXTURE_2D;
1772 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1918 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1773 glColor 0, 0, 0, 1; 1919 glColor 0, 0, 0, 1;
1774 1920
… …
1793 1939
1794sub new { 1940sub new {
1795 my $class = shift; 1941 my $class = shift;
1796 1942
1797 $class->SUPER::new ( 1943 $class->SUPER::new (
1798 padding => 2, 1944 padding_x => 2,
1945 padding_y => 2,
1799 fg => [1, 1, 1], 1946 fg => [1, 1, 1],
1800 active_fg => [1, 1, 0], 1947 active_fg => [1, 1, 0],
1801 bg => [0, 0, 0, 0.2], 1948 bg => [0, 0, 0, 0.2],
1802 active_bg => [1, 1, 1, 0.5], 1949 active_bg => [1, 1, 1, 0.5],
1803 state => 0, 1950 state => 0,
… …
1807} 1954}
1808 1955
1809sub size_request { 1956sub size_request {
1810 my ($self) = @_; 1957 my ($self) = @_;
1811 1958
1812 ($self->{padding} * 2 + 6) x 2 1959 (6) x 2
1813} 1960}
1814 1961
1815sub button_down { 1962sub button_down {
1816 my ($self, $ev, $x, $y) = @_; 1963 my ($self, $ev, $x, $y) = @_;
1817 1964
1818 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1965 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1819 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1966 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1820 $self->{state} = !$self->{state}; 1967 $self->{state} = !$self->{state};
1821 $self->_emit (changed => $self->{state}); 1968 $self->_emit (changed => $self->{state});
1969 } else {
1970 return 0
1971 }
1972
1822 } 1973 1
1823} 1974}
1824 1975
1825sub _draw { 1976sub _draw {
1826 my ($self) = @_; 1977 my ($self) = @_;
1827 1978
1828 $self->SUPER::_draw; 1979 $self->SUPER::_draw;
1829 1980
1830 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1981 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1831 1982
1832 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;
1833 1986
1834 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1987 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1835 1988
1836 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1989 my $tex = $self->{state} ? $tex[1] : $tex[0];
1837 1990
… …
1992 2145
1993 my $h1 = $self->{h} * (1 - $ycut1); 2146 my $h1 = $self->{h} * (1 - $ycut1);
1994 my $h2 = $self->{h} * (1 - $ycut2); 2147 my $h2 = $self->{h} * (1 - $ycut2);
1995 2148
1996 glEnable GL_BLEND; 2149 glEnable GL_BLEND;
1997 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;
1998 glEnable GL_TEXTURE_2D; 2152 glEnable GL_TEXTURE_2D;
1999 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2153 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2000 2154
2001 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2155 glBindTexture GL_TEXTURE_2D, $t1->{name};
2002 glBegin GL_QUADS; 2156 glBegin GL_QUADS;
… …
2102 fg => [1, 1, 1], 2256 fg => [1, 1, 1],
2103 active_fg => [0, 0, 0], 2257 active_fg => [0, 0, 0],
2104 bg => [0, 0, 0, 0.2], 2258 bg => [0, 0, 0, 0.2],
2105 active_bg => [1, 1, 1, 0.5], 2259 active_bg => [1, 1, 1, 0.5],
2106 range => [0, 0, 100, 10, 0], 2260 range => [0, 0, 100, 10, 0],
2107 req_w => $::WIDTH / 80, 2261 min_w => $::WIDTH / 80,
2108 req_h => $::WIDTH / 80, 2262 min_h => $::WIDTH / 80,
2109 vertical => 0, 2263 vertical => 0,
2110 can_hover => 1, 2264 can_hover => 1,
2111 inner_pad => 0.02, 2265 inner_pad => 0.02,
2112 @_ 2266 @_
2113 ); 2267 );
… …
2116 $self->update; 2270 $self->update;
2117 2271
2118 $self 2272 $self
2119} 2273}
2120 2274
2275sub changed { }
2276
2121sub set_range { 2277sub set_range {
2122 my ($self, $range) = @_; 2278 my ($self, $range) = @_;
2123 2279
2124 $self->{range} = $range; 2280 ($range, $self->{range}) = ($self->{range}, $range);
2125 2281
2126 $self->update; 2282 $self->update
2283 if "@$range" ne "@{$self->{range}}";
2127} 2284}
2128 2285
2129sub set_value { 2286sub set_value {
2130 my ($self, $value) = @_; 2287 my ($self, $value) = @_;
2131 2288
… …
2150} 2307}
2151 2308
2152sub size_request { 2309sub size_request {
2153 my ($self) = @_; 2310 my ($self) = @_;
2154 2311
2155 my $w = $self->{req_w}; 2312 ($self->{req_w}, $self->{req_h})
2156 my $h = $self->{req_h};
2157
2158 $self->{vertical} ? ($h, $w) : ($w, $h)
2159} 2313}
2160 2314
2161sub button_down { 2315sub button_down {
2162 my ($self, $ev, $x, $y) = @_; 2316 my ($self, $ev, $x, $y) = @_;
2163 2317
2164 $self->SUPER::button_down ($ev, $x, $y); 2318 $self->SUPER::button_down ($ev, $x, $y);
2165 2319
2166 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2320 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2167 2321
2168 $self->mouse_motion ($ev, $x, $y); 2322 $self->mouse_motion ($ev, $x, $y)
2169} 2323}
2170 2324
2171sub mouse_motion { 2325sub mouse_motion {
2172 my ($self, $ev, $x, $y) = @_; 2326 my ($self, $ev, $x, $y) = @_;
2173 2327
… …
2177 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2331 my (undef, $lo, $hi, $page) = @{$self->{range}};
2178 2332
2179 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2333 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2180 2334
2181 $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
2182 } 2340 1
2183} 2341}
2184 2342
2185sub update { 2343sub update {
2186 my ($self) = @_; 2344 my ($self) = @_;
2187 2345
2188 $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}) {
2189 $self->set_value ($self->{range}[0]); 2354 $self->set_value ($self->{range}[0]);
2190 2355
2191 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2356 my ($value, $lo, $hi, $page) = @{$self->{range}};
2192 my $range = ($hi - $page - $lo) || 1e-100; 2357 my $range = ($hi - $page - $lo) || 1e-100;
2193 2358
… …
2199 $value = ($value - $lo) / $range; 2364 $value = ($value - $lo) / $range;
2200 $value = $value * $self->{scale} + $self->{offset}; 2365 $value = $value * $self->{scale} + $self->{offset};
2201 2366
2202 $self->{knob_x} = $value - $knob_w * 0.5; 2367 $self->{knob_x} = $value - $knob_w * 0.5;
2203 $self->{knob_w} = $knob_w; 2368 $self->{knob_w} = $knob_w;
2204 }); 2369 }
2205
2206 $self->SUPER::update;
2207}
2208
2209sub _draw {
2210 my ($self) = @_;
2211 2370
2212 $self->SUPER::_draw (); 2371 $self->SUPER::_draw ();
2213 2372
2214 glScale $self->{w}, $self->{h}; 2373 glScale $self->{w}, $self->{h};
2215 2374
… …
2409 2568
2410 delete $self->{texture}; 2569 delete $self->{texture};
2411 } 2570 }
2412 2571
2413 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2572 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2414 glClearColor 0.5, 0.5, 0.5, 0; 2573 glClearColor 0, 0, 0, 0;
2415 glClear GL_COLOR_BUFFER_BIT; 2574 glClear GL_COLOR_BUFFER_BIT;
2416 2575
2417 my $top = int $self->{children}[1]{range}[0]; 2576 my $top = int $self->{children}[1]{range}[0];
2418 2577
2419 my $y0 = $top; 2578 my $y0 = $top;
… …
2454sub _draw { 2613sub _draw {
2455 my ($self) = @_; 2614 my ($self) = @_;
2456 2615
2457 glEnable GL_TEXTURE_2D; 2616 glEnable GL_TEXTURE_2D;
2458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2617 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2459 glColor 1, 1, 1, 1; 2618 glColor 0, 0, 0, 1;
2460 $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});
2461 glDisable GL_TEXTURE_2D; 2620 glDisable GL_TEXTURE_2D;
2462 2621
2463 $self->{children}[1]->draw; 2622 $self->{children}[1]->draw;
2464 2623
2465} 2624}
… …
2514 2673
2515sub new { 2674sub new {
2516 my $class = shift; 2675 my $class = shift;
2517 2676
2518 my $self = $class->SUPER::new ( 2677 my $self = $class->SUPER::new (
2519 state => 0, 2678 state => 0,
2520 connect_activate => \&toggle_flopper, 2679 on_activate => \&toggle_flopper,
2521 @_ 2680 @_
2522 ); 2681 );
2523 2682
2524 if ($self->{state}) {
2525 $self->{state} = 0;
2526 $self->toggle_flopper;
2527 }
2528
2529 $self 2683 $self
2530} 2684}
2531 2685
2532sub toggle_flopper { 2686sub toggle_flopper {
2533 my ($self) = @_; 2687 my ($self) = @_;
2534 2688
2535 # TODO: use animation 2689 $self->{other}->toggle_visibility;
2536 if ($self->{state} = !$self->{state}) {
2537 $CFClient::UI::ROOT->add ($self->{other});
2538 $self->{other}->move ($self->coord2global (0, $self->{h}));
2539 $self->_emit ("open");
2540 } else {
2541 $CFClient::UI::ROOT->remove ($self->{other});
2542 $self->_emit ("close");
2543 }
2544
2545 $self->_emit (changed => $self->{state});
2546} 2690}
2547 2691
2548############################################################################# 2692#############################################################################
2549 2693
2550package CFClient::UI::Tooltip; 2694package CFClient::UI::Tooltip;
… …
2563} 2707}
2564 2708
2565sub set_tooltip_from { 2709sub set_tooltip_from {
2566 my ($self, $widget) = @_; 2710 my ($self, $widget) = @_;
2567 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
2568 $self->add (new CFClient::UI::Label 2721 $self->add (new CFClient::UI::Label
2569 markup => $widget->{tooltip}, 2722 markup => $tooltip,
2570 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2723 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2571 fontsize => 0.8, 2724 fontsize => 0.8,
2572 fg => [0, 0, 0, 1], 2725 fg => [0, 0, 0, 1],
2573 ellipsise => 0, 2726 ellipsise => 0,
2574 font => ($widget->{tooltip_font} || $::FONT_PROP), 2727 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2585 2738
2586sub size_allocate { 2739sub size_allocate {
2587 my ($self, $w, $h) = @_; 2740 my ($self, $w, $h) = @_;
2588 2741
2589 $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 });
2590} 2761}
2591 2762
2592sub _draw { 2763sub _draw {
2593 my ($self) = @_; 2764 my ($self) = @_;
2594 2765
… …
2611 glVertex $w, $h; 2782 glVertex $w, $h;
2612 glVertex $w, 0; 2783 glVertex $w, 0;
2613 glEnd; 2784 glEnd;
2614 2785
2615 glTranslate 2 - 0.375, 2 - 0.375; 2786 glTranslate 2 - 0.375, 2 - 0.375;
2787
2616 $self->SUPER::_draw; 2788 $self->SUPER::_draw;
2617} 2789}
2618 2790
2619############################################################################# 2791#############################################################################
2620 2792
… …
2626 2798
2627sub new { 2799sub new {
2628 my $class = shift; 2800 my $class = shift;
2629 2801
2630 my $self = $class->SUPER::new ( 2802 my $self = $class->SUPER::new (
2631 aspect => 1, 2803 aspect => 1,
2804 can_events => 0,
2632 @_, 2805 @_,
2633 ); 2806 );
2634 2807
2635 if ($self->{anim} && $self->{animspeed}) { 2808 if ($self->{anim} && $self->{animspeed}) {
2636 Scalar::Util::weaken (my $widget = $self); 2809 Scalar::Util::weaken (my $widget = $self);
… …
2678 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2851 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2679 2852
2680 if ($tex) { 2853 if ($tex) {
2681 glEnable GL_TEXTURE_2D; 2854 glEnable GL_TEXTURE_2D;
2682 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2855 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2683 glColor 1, 1, 1, 1; 2856 glColor 0, 0, 0, 1;
2684 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2857 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2685 glDisable GL_TEXTURE_2D; 2858 glDisable GL_TEXTURE_2D;
2686 } 2859 }
2687} 2860}
2688 2861
… …
2695 $self->SUPER::DESTROY; 2868 $self->SUPER::DESTROY;
2696} 2869}
2697 2870
2698############################################################################# 2871#############################################################################
2699 2872
2700package CFClient::UI::InventoryItem; 2873package CFClient::UI::Buttonbar;
2701 2874
2702our @ISA = CFClient::UI::HBox::; 2875our @ISA = CFClient::UI::HBox::;
2703 2876
2704sub _item_to_desc { 2877# TODO: should actualyl wrap buttons and other goodies.
2705 my ($item) = @_;
2706
2707 my $desc =
2708 $item->{nrof} < 2
2709 ? $item->{name}
2710 : "$item->{nrof} × $item->{name_pl}";
2711
2712 $item->{flags} & Crossfire::Protocol::F_OPEN
2713 and $desc .= " (open)";
2714 $item->{flags} & Crossfire::Protocol::F_APPLIED
2715 and $desc .= " (applied)";
2716 $item->{flags} & Crossfire::Protocol::F_UNPAID
2717 and $desc .= " (unpaid)";
2718 $item->{flags} & Crossfire::Protocol::F_MAGIC
2719 and $desc .= " (magic)";
2720 $item->{flags} & Crossfire::Protocol::F_CURSED
2721 and $desc .= " (cursed)";
2722 $item->{flags} & Crossfire::Protocol::F_DAMNED
2723 and $desc .= " (damned)";
2724 $item->{flags} & Crossfire::Protocol::F_LOCKED
2725 and $desc .= " *";
2726
2727 $desc
2728}
2729
2730sub new {
2731 my $class = shift;
2732
2733 my %args = @_;
2734
2735 my $item = delete $args{item};
2736
2737 my $desc = _item_to_desc ($item);
2738
2739 my $self = $class->SUPER::new (
2740 can_hover => 1,
2741 can_events => 1,
2742 tooltip => ((CFClient::UI::Label::escape $desc)
2743 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2744 connect_button_down => sub {
2745 my ($self, $ev, $x, $y) = @_;
2746
2747 # todo: maybe put examine on 1? but should just be a tooltip :(
2748 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2749 my $targ = $::CONN->{player}{tag};
2750
2751 if ($item->{container} == $::CONN->{player}{tag}) {
2752 $targ = $main::OPENCONT;
2753 }
2754
2755 $::CONN->send ("move $targ $item->{tag} 0");
2756 } elsif ($ev->{button} == 1) {
2757 $::CONN->send ("examine $item->{tag}");
2758 } elsif ($ev->{button} == 2) {
2759 $::CONN->send ("apply $item->{tag}");
2760 } elsif ($ev->{button} == 3) {
2761 my @menu_items = (
2762 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2763 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2764 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2765 (
2766 $item->{flags} & Crossfire::Protocol::F_LOCKED
2767 ? (
2768 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2769 )
2770 : (
2771 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2772 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2773 )
2774 ),
2775 );
2776
2777 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2778 }
2779
2780 1
2781 },
2782 %args
2783 );
2784
2785
2786 $self->add (new CFClient::UI::Face
2787 can_events => 0,
2788 face => $item->{face},
2789 anim => $item->{anim},
2790 animspeed => $item->{animspeed},
2791 );
2792
2793 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2794
2795 $self->{item} = $item;
2796
2797 $self->update_item;
2798
2799 $self
2800}
2801
2802sub update_item {
2803 my ($self) = @_;
2804
2805 my $desc = _item_to_desc ($self->{item});
2806
2807 $self->{name_lbl}->set_text ($desc);
2808}
2809
2810#############################################################################
2811
2812package CFClient::UI::Inventory;
2813
2814our @ISA = CFClient::UI::ScrolledWindow::;
2815
2816sub new {
2817 my $class = shift;
2818
2819 my $self = $class->SUPER::new (
2820 scrolled => (new CFClient::UI::Table),
2821 @_,
2822 );
2823
2824 $self
2825}
2826
2827sub set_items {
2828 my ($self, $items) = @_;
2829
2830 $self->{scrolled}->clear;
2831 return unless $items;
2832
2833 my @items = sort {
2834 ($a->{type} <=> $b->{type})
2835 or ($a->{name} cmp $b->{name})
2836 } @$items;
2837
2838 $self->{real_items} = \@items;
2839
2840 for my $item (@items) {
2841 $item->{item} = $item;
2842 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2843 $item->update_item ();
2844 }
2845
2846 my $i = 0;
2847 for (@items) {
2848 $self->{scrolled}->add (0, $i, $_);
2849 my $nrof = $_->{item}->{nrof} || 1;
2850 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2851 }
2852
2853# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2854}
2855
2856sub size_request {
2857 my ($self) = @_;
2858 ($self->{req_w}, $self->{req_h});
2859}
2860 2878
2861############################################################################# 2879#############################################################################
2862 2880
2863package CFClient::UI::Menu; 2881package CFClient::UI::Menu;
2864 2882
… …
2905 # maybe save $GRAB? must be careful about events... 2923 # maybe save $GRAB? must be careful about events...
2906 $GRAB = $self; 2924 $GRAB = $self;
2907 $self->{button} = $ev->{button}; 2925 $self->{button} = $ev->{button};
2908 2926
2909 $self->show; 2927 $self->show;
2910 $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);
2911} 2929}
2912 2930
2913sub mouse_motion { 2931sub mouse_motion {
2914 my ($self, $ev, $x, $y) = @_; 2932 my ($self, $ev, $x, $y) = @_;
2915 2933
2916 # TODO: should use vbox->find_widget or so 2934 # TODO: should use vbox->find_widget or so
2917 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2935 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2918 $self->{hover} = $self->{item}{$HOVER}; 2936 $self->{hover} = $self->{item}{$HOVER};
2937
2938 0
2919} 2939}
2920 2940
2921sub button_up { 2941sub button_up {
2922 my ($self, $ev, $x, $y) = @_; 2942 my ($self, $ev, $x, $y) = @_;
2923 2943
… …
2925 undef $GRAB; 2945 undef $GRAB;
2926 $self->hide; 2946 $self->hide;
2927 2947
2928 $self->_emit ("popdown"); 2948 $self->_emit ("popdown");
2929 $self->{hover}[1]->() if $self->{hover}; 2949 $self->{hover}[1]->() if $self->{hover};
2950 } else {
2951 return 0
2952 }
2953
2930 } 2954 1
2931} 2955}
2932 2956
2933############################################################################# 2957#############################################################################
2934 2958
2935package CFClient::UI::Statusbox; 2959package CFClient::UI::Multiplexer;
2936 2960
2937our @ISA = CFClient::UI::VBox::; 2961our @ISA = CFClient::UI::Container::;
2938 2962
2939sub new { 2963sub new {
2940 my $class = shift; 2964 my $class = shift;
2941 2965
2942 $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 (
2943 fontsize => 0.8, 3075 fontsize => 0.8,
2944 @_, 3076 @_,
2945 ) 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
2946} 3087}
2947 3088
2948sub reorder { 3089sub reorder {
2949 my ($self) = @_; 3090 my ($self) = @_;
2950 my $NOW = time; 3091 my $NOW = Time::HiRes::time;
2951 3092
2952 while (my ($k, $v) = each %{ $self->{item} }) { 3093 while (my ($k, $v) = each %{ $self->{item} }) {
2953 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3094 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2954 } 3095 }
2955 3096
… …
2957 3098
2958 my @items = sort { 3099 my @items = sort {
2959 $a->{pri} <=> $b->{pri} 3100 $a->{pri} <=> $b->{pri}
2960 or $b->{id} <=> $a->{id} 3101 or $b->{id} <=> $a->{id}
2961 } values %{ $self->{item} }; 3102 } values %{ $self->{item} };
3103
3104 $self->{timer}->interval (1);
2962 3105
2963 my $count = 10 + 1; 3106 my $count = 10 + 1;
2964 for my $item (@items) { 3107 for my $item (@items) {
2965 last unless --$count; 3108 last unless --$count;
2966 3109
… …
2981 tooltip_font => $::FONT_PROP, 3124 tooltip_font => $::FONT_PROP,
2982 tooltip_width => 0.67, 3125 tooltip_width => 0.67,
2983 fontsize => $item->{fontsize} || $self->{fontsize}, 3126 fontsize => $item->{fontsize} || $self->{fontsize},
2984 max_w => $::WIDTH * 0.44, 3127 max_w => $::WIDTH * 0.44,
2985 fg => $item->{fg}, 3128 fg => $item->{fg},
3129 orig_alpha => $item->{fg}[3] || 1,
2986 can_events => 1, 3130 can_events => 1,
2987 can_hover => 1 3131 can_hover => 1
2988 }; 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 }
2989 } 3143 }
2990 3144
2991 $self->clear; 3145 $self->clear;
2992 $self->SUPER::add (reverse @widgets); 3146 $self->SUPER::add (reverse @widgets);
2993} 3147}
… …
2996 my ($self, $text, %arg) = @_; 3150 my ($self, $text, %arg) = @_;
2997 3151
2998 $text =~ s/^\s+//; 3152 $text =~ s/^\s+//;
2999 $text =~ s/\s+$//; 3153 $text =~ s/\s+$//;
3000 3154
3155 return unless $text;
3156
3001 my $timeout = time + ((delete $arg{timeout}) || 60); 3157 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3002 3158
3003 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3159 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3004 3160
3005 if (my $item = $self->{item}{$group}) { 3161 if (my $item = $self->{item}{$group}) {
3006 if ($item->{text} eq $text) { 3162 if ($item->{text} eq $text) {
… …
3036 3192
3037 $self->reorder; 3193 $self->reorder;
3038 $self->SUPER::reconfigure; 3194 $self->SUPER::reconfigure;
3039} 3195}
3040 3196
3197sub DESTROY {
3198 my ($self) = @_;
3199
3200 $self->{timer}->cancel;
3201
3202 $self->SUPER::DESTROY;
3203}
3204
3041############################################################################# 3205#############################################################################
3042 3206
3043package CFClient::UI::Root; 3207package CFClient::UI::Inventory;
3044 3208
3045our @ISA = CFClient::UI::Container::; 3209our @ISA = CFClient::UI::ScrolledWindow::;
3046
3047use CFClient::OpenGL;
3048 3210
3049sub new { 3211sub new {
3050 my $class = shift; 3212 my $class = shift;
3051 3213
3052 $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 => [],
3053 @_, 3456 @_,
3054 ) 3457 )
3055} 3458}
3056 3459
3057sub configure { 3460# XXX: Do sorting? Argl...
3058 my ($self, $x, $y, $w, $h) = @_; 3461sub add_spell {
3059
3060 $self->{w} = $w;
3061 $self->{h} = $h;
3062}
3063
3064sub check_size {
3065 my ($self) = @_; 3462 my ($self, $spell) = @_;
3463 $self->{spells}->{$spell->{name}} = $spell;
3066 3464
3067 $self->size_allocate ($self->{w}, $self->{h}) 3465 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3068 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
3069} 3521}
3070 3522
3071sub size_request { 3523sub size_request {
3072 my ($self) = @_; 3524 my ($self) = @_;
3073 3525
3074 ($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
3075} 3541}
3076 3542
3077sub size_allocate { 3543sub size_allocate {
3078 my ($self, $w, $h) = @_; 3544 my ($self, $w, $h) = @_;
3079 3545
3080 for my $child ($self->children) { 3546 for my $child ($self->children) {
3081 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)};
3082 3548
3083 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3549 $X = $child->{force_x} if exists $child->{force_x};
3084 if exists $child->{req_x}; 3550 $Y = $child->{force_y} if exists $child->{force_y};
3085 3551
3086 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3552 $X = _to_pixel $X, $W, $self->{w};
3087 if exists $child->{req_y}; 3553 $Y = _to_pixel $Y, $H, $self->{h};
3088
3089 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3090 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3091 3554
3092 $child->configure ($X, $Y, $W, $H); 3555 $child->configure ($X, $Y, $W, $H);
3093 } 3556 }
3094} 3557}
3095 3558
… …
3106} 3569}
3107 3570
3108sub update { 3571sub update {
3109 my ($self) = @_; 3572 my ($self) = @_;
3110 3573
3111 $self->check_size;
3112 $::WANT_REFRESH++; 3574 $::WANT_REFRESH++;
3113} 3575}
3114 3576
3115sub add { 3577sub add {
3116 my ($self, @children) = @_; 3578 my ($self, @children) = @_;
3117 3579
3118 for (my @widgets = @children; my $w = pop @widgets; ) {
3119 push @widgets, $w->children;
3120 $w->{root} = $self;
3121 $w->{visible} = 1;
3122 }
3123
3124 for my $child (@children) {
3125 $child->{is_toplevel} = 1; 3580 $_->{is_toplevel} = 1
3126 3581 for @children;
3127 # integerise window positions
3128 $child->{x} = int $child->{x};
3129 $child->{y} = int $child->{y};
3130 }
3131 3582
3132 $self->SUPER::add (@children); 3583 $self->SUPER::add (@children);
3133} 3584}
3134 3585
3135sub remove { 3586sub remove {
3136 my ($self, @children) = @_; 3587 my ($self, @children) = @_;
3137 3588
3138 $self->SUPER::remove (@children); 3589 $self->SUPER::remove (@children);
3590
3591 delete $self->{is_toplevel}
3592 for @children;
3139 3593
3140 while (@children) { 3594 while (@children) {
3141 my $w = pop @children; 3595 my $w = pop @children;
3142 push @children, $w->children; 3596 push @children, $w->children;
3143 $w->set_invisible; 3597 $w->set_invisible;
… …
3162 while ($self->{refresh_hook}) { 3616 while ($self->{refresh_hook}) {
3163 $_->() 3617 $_->()
3164 for values %{delete $self->{refresh_hook}}; 3618 for values %{delete $self->{refresh_hook}};
3165 } 3619 }
3166 3620
3167 if ($self->{check_size}) { 3621 if ($self->{realloc}) {
3168 my @queue = ([], []); 3622 my %queue;
3623 my @queue;
3624 my $widget;
3169 3625
3170 for (;;) { 3626 outer:
3171 if ($self->{check_size}) { 3627 while () {
3172 # heuristic: check containers last 3628 if (my $realloc = delete $self->{realloc}) {
3173 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3629 for $widget (values %$realloc) {
3174 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 }
3175 } 3636 }
3176 3637
3177 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3638 while () {
3639 @queue or last outer;
3178 3640
3179 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3641 $widget = pop @{ $queue[-1] || [] }
3180 ? @$widget{qw(user_w user_h)} 3642 and last;
3181 : $widget->size_request;
3182
3183 if (delete $widget->{force_alloc}
3184 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3185 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3186 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}) {
3187 $widget->{req_w} = $w; 3662 $widget->{req_w} = $w;
3188 $widget->{req_h} = $h; 3663 $widget->{req_h} = $h;
3189 3664
3190 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3665 $self->{size_alloc}{$widget+0} = $widget;
3191 3666
3192 $widget->{parent}->check_size
3193 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 }
3194 } 3674 }
3675
3676 delete $self->{realloc}{$widget+0};
3195 } 3677 }
3196 } 3678 }
3197 3679
3198 while ($self->{size_alloc}) { 3680 while (my $size_alloc = delete $self->{size_alloc}) {
3199 for (values %{delete $self->{size_alloc}}) { 3681 my @queue = sort { $b->{visible} <=> $a->{visible} }
3200 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)};
3201 3688
3202 $w = 0 if $w < 0; 3689 $w = 0 if $w < 0;
3203 $h = 0 if $h < 0; 3690 $h = 0 if $h < 0;
3204 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
3205 $widget->{w} = $w; 3699 $widget->{w} = $w;
3206 $widget->{h} = $h; 3700 $widget->{h} = $h;
3701
3207 $widget->emit (size_allocate => $w, $h); 3702 $widget->emit (size_allocate => $w, $h);
3703 }
3208 } 3704 }
3209 } 3705 }
3210 3706
3211 while ($self->{post_alloc_hook}) { 3707 while ($self->{post_alloc_hook}) {
3212 $_->() 3708 $_->()
3213 for values %{delete $self->{post_alloc_hook}}; 3709 for values %{delete $self->{post_alloc_hook}};
3214 } 3710 }
3711
3215 3712
3216 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3713 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3217 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3714 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3218 glClear GL_COLOR_BUFFER_BIT; 3715 glClear GL_COLOR_BUFFER_BIT;
3219 3716
… …
3221 glLoadIdentity; 3718 glLoadIdentity;
3222 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3719 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3223 glMatrixMode GL_MODELVIEW; 3720 glMatrixMode GL_MODELVIEW;
3224 glLoadIdentity; 3721 glLoadIdentity;
3225 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
3226 $self->_draw; 3730 $self->_draw;
3227} 3731}
3228 3732
3229############################################################################# 3733#############################################################################
3230 3734

Diff Legend

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