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.253 by root, Sun May 28 23:28:12 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
45 $TOOLTIP->hide; 27 $TOOLTIP->hide;
46 28
47 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
48 32
49 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
50 34
51 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
52 36
… …
59 } 43 }
60 } 44 }
61 45
62 $TOOLTIP->hide; 46 $TOOLTIP->hide;
63 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
64} 71}
65 72
66# class methods for events 73# class methods for events
67sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
68 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
82 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
83 90
84 $GRAB = $widget; 91 $GRAB = $widget;
85 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
86 93
87 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
88 } 95 }
89 96
90 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
91 98
92 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
107 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
108 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
109 $grab->update if $grab; 116 $grab->update if $grab;
110 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
111 118
112 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
113 } 120 }
114} 121}
115 122
116sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
117 my ($ev) = @_; 124 my ($ev) = @_;
… …
123 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
124 131
125 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
126 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
127 134
128 check_tooltip; 135 $TOOLTIP_WATCHER->start;
129 } 136 }
130 137
131 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
132 if $HOVER; 139 if $HOVER;
133} 140}
… …
165sub rescale_widgets { 172sub rescale_widgets {
166 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
167 174
168 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
169 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
170 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
171 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
172 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
173 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
174 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
175 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
176 } 190 }
177 } 191 }
178 192
179 reconfigure_widgets; 193 reconfigure_widgets;
180} 194}
… …
189 203
190sub new { 204sub new {
191 my $class = shift; 205 my $class = shift;
192 206
193 my $self = bless { 207 my $self = bless {
194 x => 0, 208 x => "center",
195 y => 0, 209 y => "center",
196 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
197 can_events => 1, 213 can_events => 1,
198 @_ 214 @_
199 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
200 218
201 for (keys %$self) { 219 for (keys %$self) {
202 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
203 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
204 } 222 }
205 } 223 }
206 224
207 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
208
209 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
210 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
211 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
212 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
213 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
214 } 235 }
215 236
216 $self 237 $self
217} 238}
218 239
… …
229 return if $self->{parent}; 250 return if $self->{parent};
230 251
231 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
232} 253}
233 254
234sub center {
235 my ($self) = @_;
236
237 $CFClient::UI::ROOT->on_post_alloc (
238 "center_$self" => sub {
239 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
240 },
241 );
242
243 $self->update;
244}
245
246sub set_visible { 255sub set_visible {
247 my ($self) = @_; 256 my ($self) = @_;
248 257
249 return if $self->{visible}; 258 return if $self->{visible};
250 259
… …
269 delete $self->{visible}; 278 delete $self->{visible};
270 279
271 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
272 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
273 282
274 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
275 if $TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
276 285
277 $self->focus_out; 286 $self->focus_out;
278 287
279 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
… …
303 312
304 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
305 if $self->{parent}; 314 if $self->{parent};
306} 315}
307 316
308sub move { 317sub move_abs {
309 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
310 319
311 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
312 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
313 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
314 323
315 $self->update; 324 $self->update;
316} 325}
317 326
318sub set_size { 327sub set_size {
319 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
320 329
321 $self->{def_w} = $w; 330 $self->{force_w} = $w;
322 $self->{def_h} = $h; 331 $self->{force_h} = $h;
323 332
324 $self->realloc; 333 $self->realloc;
325} 334}
326 335
327sub size_request { 336sub size_request {
… …
331 340
332sub configure { 341sub configure {
333 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
334 343
335 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
336 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
337 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
338 349
339 # use alignment to adjust x, y 350 # use alignment to adjust x, y
340 351
341 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
342 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
343
344 ($w, $h) = ($w2, $h2);
345 } 354 }
346 355
347 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
348 $self->{x} = $x; 357 $self->{x} = $x;
349 $self->{y} = $y; 358 $self->{y} = $y;
350 $self->update; 359 $self->update;
351 } 360 }
352 361
353 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
354 return unless $self->{visible}; 363 return unless $self->{visible};
355 364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
356 $self->{root}->{size_alloc}{$self+0} = [$self, $w, $h]; 368 $self->{root}{size_alloc}{$self+0} = $self;
357 } 369 }
358} 370}
359 371
360sub size_allocate { 372sub size_allocate {
361 # nothing to be done 373 # nothing to be done
362} 374}
363 375
364sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
365} 382}
366 383
367sub set_max_size { 384sub set_max_size {
368 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
369 386
370 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
371 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
372} 391}
373 392
374sub set_tooltip { 393sub set_tooltip {
375 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
376 395
… …
381 400
382 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
383 402
384 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
385 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
386 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
387 } 406 }
388} 407}
389 408
390# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
391sub coord2local { 410sub coord2local {
… …
428 447
429 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 448 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
430 unless $FOCUS; 449 unless $FOCUS;
431} 450}
432 451
433sub mouse_motion { } 452sub mouse_motion { 0 }
434sub button_up { } 453sub button_up { 0 }
435sub key_down { } 454sub key_down { 0 }
436sub key_up { } 455sub key_up { 0 }
437 456
438sub button_down { 457sub button_down {
439 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
440 459
441 $self->focus_in; 460 $self->focus_in;
442}
443 461
444sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
445sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
446sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
447sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
448sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
449 464
450sub find_widget { 465sub find_widget {
451 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
452 467
453 return () unless $self->{can_events}; 468 return () unless $self->{can_events};
… …
461 476
462sub set_parent { 477sub set_parent {
463 my ($self, $parent) = @_; 478 my ($self, $parent) = @_;
464 479
465 Scalar::Util::weaken ($self->{parent} = $parent); 480 Scalar::Util::weaken ($self->{parent} = $parent);
466
467 $self->set_visible if $parent->{visible}; 481 $self->set_visible if $parent->{visible};
468} 482}
469 483
470sub connect { 484sub connect {
471 my ($self, $signal, $cb) = @_; 485 my ($self, $signal, $cb) = @_;
… …
492 506
493sub realloc { 507sub realloc {
494 my ($self) = @_; 508 my ($self) = @_;
495 509
496 if ($self->{visible}) { 510 if ($self->{visible}) {
497 return if $self->{root}{realloc}{$self}; 511 return if $self->{root}{realloc}{$self+0};
498 512
499 $self->{root}{realloc}{$self} = $self; 513 $self->{root}{realloc}{$self+0} = $self;
500 $self->{root}->update; 514 $self->{root}->update;
501 } else { 515 } else {
502 delete $self->{req_w}; 516 delete $self->{req_w};
517 delete $self->{req_h};
503 } 518 }
504} 519}
505 520
506sub update { 521sub update {
507 my ($self) = @_; 522 my ($self) = @_;
508 523
509 $self->{parent}->update 524 $self->{parent}->update
510 if $self->{parent}; 525 if $self->{parent};
511} 526}
512 527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
538
513sub draw { 539sub draw {
514 my ($self) = @_; 540 my ($self) = @_;
515 541
516 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
517 553
518 glPushMatrix; 554 glPushMatrix;
519 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
520 $self->_draw;
521 glPopMatrix;
522 556
523 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
524 my ($x, $y) = @$self{qw(x y)};
525
526 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
527 glEnable GL_BLEND; 559 glEnable GL_BLEND;
528 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
529 glBegin GL_QUADS; 561 glBegin GL_QUADS;
530 glVertex $x , $y; 562 glVertex 0 , 0;
531 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
532 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
533 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
534 glEnd; 566 glEnd;
535 glDisable GL_BLEND; 567 glDisable GL_BLEND;
536 } 568 }
537 569
538 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
539 glPushMatrix; 571 glPushMatrix;
540 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
541 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
542 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
543 glVertex 0 , 0; 575 glVertex 0 , 0;
544 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
545 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
546 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
547 glEnd; 579 glEnd;
548 glPopMatrix; 580 glPopMatrix;
549 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
550 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
551} 586}
552 587
553sub _draw { 588sub _draw {
554 my ($self) = @_; 589 my ($self) = @_;
555 590
… …
593 628
594 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
595 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
596 631
597 glEnable GL_BLEND; 632 glEnable GL_BLEND;
598 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
599 glColor @$color; 634 glColor_premultiply @$color;
600 635
601 glBegin GL_QUADS; 636 glBegin GL_QUADS;
602 glVertex 0 , 0; 637 glVertex 0 , 0;
603 glVertex 0 , $h; 638 glVertex 0 , $h;
604 glVertex $w, $h; 639 glVertex $w, $h;
… …
619 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
620 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
621} 656}
622 657
623sub size_request { 658sub size_request {
624 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
625} 662}
626 663
627sub draw { } 664sub draw { }
628 665
629############################################################################# 666#############################################################################
… …
633our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
634 671
635sub new { 672sub new {
636 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
637 674
638 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
639 676
640 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
641 children => [], 678 children => [],
642 can_events => 0, 679 can_events => 0,
643 %arg, 680 %arg,
644 ); 681 );
682
645 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
646 685
647 $self 686 $self
648} 687}
649 688
650sub add { 689sub add {
… …
698 $x -= $self->{x}; 737 $x -= $self->{x};
699 $y -= $self->{y}; 738 $y -= $self->{y};
700 739
701 my $res; 740 my $res;
702 741
703 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
704 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
705 and return $res; 744 and return $res;
706 } 745 }
707 746
708 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
750sub size_request { 789sub size_request {
751 $_[0]{children}[0]->size_request 790 $_[0]{children}[0]->size_request
752} 791}
753 792
754sub size_allocate { 793sub size_allocate {
755 my ($self, $w, $h, $changed) = @_; 794 my ($self, $w, $h) = @_;
756 795
757 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
758} 797}
759 798
760############################################################################# 799#############################################################################
800
801# back-buffered drawing area
761 802
762package CFClient::UI::Window; 803package CFClient::UI::Window;
763 804
764our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
765 806
… …
777 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
778 $self->SUPER::update; 819 $self->SUPER::update;
779} 820}
780 821
781sub size_allocate { 822sub size_allocate {
782 my ($self, $w, $h, $changed) = @_; 823 my ($self, $w, $h) = @_;
783 824
784 $self->SUPER::size_allocate ($w, $h, $changed); 825 $self->SUPER::size_allocate ($w, $h);
785 $self->update 826 $self->update;
786 if $changed;
787} 827}
788 828
789sub _render { 829sub _render {
830 my ($self) = @_;
831
790 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
791} 833}
792 834
793sub render_child { 835sub render_child {
794 my ($self) = @_; 836 my ($self) = @_;
795 837
796 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
797 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
798 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
799 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
800 $self->_render; 849 $self->_render;
801 }; 850 };
802} 851}
803 852
804sub _draw { 853sub _draw {
805 my ($self) = @_; 854 my ($self) = @_;
806 855
807 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
808 857
809 my $tex = $self->{texture} 858 my $tex = $self->{texture}
810 or return; 859 or return;
811 860
812 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
813 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
814 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
815 864
816 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
817 866
818 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
819} 868}
… …
835} 884}
836 885
837sub size_request { 886sub size_request {
838 my ($self) = @_; 887 my ($self) = @_;
839 888
840 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
841 890
842 $w = 10 if $self->{scroll_x}; 891 $w = 10 if $self->{scroll_x};
843 $h = 10 if $self->{scroll_y}; 892 $h = 10 if $self->{scroll_y};
844 893
845 ($w, $h) 894 ($w, $h)
846} 895}
847 896
848sub size_allocate { 897sub size_allocate {
849 my ($self, $w, $h, $changed) = @_; 898 my ($self, $w, $h) = @_;
850 899
900 my $child = $self->child;
901
851 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
852 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
853 904
854 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
855 $self->update; 906 $self->update;
856} 907}
857 908
… …
893} 944}
894 945
895sub _render { 946sub _render {
896 my ($self) = @_; 947 my ($self) = @_;
897 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
898 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
899 953
900 $self->SUPER::_render; 954 $self->SUPER::_render;
901} 955}
902 956
… …
905package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
906 960
907our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
908 962
909sub new { 963sub new {
910 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
911 967
912 my $self; 968 my $self;
913 969
914 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
915 vertical => 1, 971 vertical => 1,
… …
920 ; 976 ;
921 977
922 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
923 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
924 slider => $slider, 980 slider => $slider,
925 @_, 981 %arg,
926 ); 982 );
927 983
928 $self->{vp}->add ($self->{scrolled});
929 $self->add ($self->{vp});
930 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
931 986
932 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
933} 994}
934 995
935sub update { 996sub update {
936 my ($self) = @_; 997 my ($self) = @_;
937 998
… …
941 my $child = $self->{vp}->child; 1002 my $child = $self->{vp}->child;
942 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
943} 1004}
944 1005
945sub size_allocate { 1006sub size_allocate {
946 my ($self, $w, $h, $changed) = @_; 1007 my ($self, $w, $h) = @_;
947 1008
948 $self->SUPER::size_allocate ($w, $h, $changed); 1009 $self->SUPER::size_allocate ($w, $h);
949 1010
950 my $child = $self->{vp}->child; 1011 my $child = $self->{vp}->child;
951 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]); 1012 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
952} 1013}
953 1014
… …
976 1037
977 if ($self->{bg}) { 1038 if ($self->{bg}) {
978 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
979 1040
980 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
981 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
982 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
983 1044
984 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
985 glVertex 0 , 0; 1046 glVertex 0 , 0;
986 glVertex 0 , $h; 1047 glVertex 0 , $h;
987 glVertex $w, $h; 1048 glVertex $w, $h;
… …
1000 1061
1001our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
1002 1063
1003use CFClient::OpenGL; 1064use CFClient::OpenGL;
1004 1065
1005my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
1006 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1007 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1008 1073
1009sub new { 1074sub new {
1010 my $class = shift; 1075 my ($class, %arg) = @_;
1076
1077 my $title = delete $arg{title};
1011 1078
1012 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1013 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1014 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1015 border => 0.6, 1082 border => 0.6,
1016 is_toplevel => 1,
1017 can_events => 1, 1083 can_events => 1,
1018 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1019 ); 1087 );
1020 1088
1021 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1022 align => 0, 1090 align => 0,
1023 valign => 1, 1091 valign => 1,
1024 text => $self->{title}, 1092 text => $title,
1025 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1026 1095
1027 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1028} 1104}
1029 1105
1030sub border { 1106sub border {
1031 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1032} 1108}
1033 1109
1034sub size_request { 1110sub size_request {
1035 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1036 1115
1037 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1038 1117
1039 ( 1118 (
1040 $w + $self->border * 2, 1119 $w + $self->border * 2,
1041 $h + $self->border * 2, 1120 $h + $self->border * 2,
1042 ) 1121 )
1043} 1122}
1044 1123
1045sub size_allocate { 1124sub size_allocate {
1046 my ($self, $w, $h, $changed) = @_; 1125 my ($self, $w, $h) = @_;
1047 1126
1048 return unless $changed; 1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1049 1132
1133 my $border = $self->border;
1134
1050 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1051 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1052 1137
1053 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1054 if $self->{title};
1055
1056 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1057} 1139}
1058 1140
1059sub button_down { 1141sub button_down {
1060 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1061 1143
… …
1077 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1078 1160
1079 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1080 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1081 1163
1082 $self->{user_x} = $wx + $dx * $mx;
1083 $self->{user_y} = $wy + $dy * $my;
1084 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1085 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1086 $self->move ($self->{user_x}, $self->{user_y}); 1166
1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1087 $self->realloc; 1168 $self->realloc;
1088 }; 1169 };
1089 1170
1090 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1091 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
… …
1094 $self->{motion} = sub { 1175 $self->{motion} = sub {
1095 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1096 1177
1097 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1098 1179
1099 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1100 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1101 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1102 $self->move ($self->{user_x}, $self->{user_y});
1103 $self->realloc;
1104 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1105 } 1188 1
1106} 1189}
1107 1190
1108sub button_up { 1191sub button_up {
1109 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1110 1193
1111 delete $self->{motion}; 1194 !!delete $self->{motion}
1112} 1195}
1113 1196
1114sub mouse_motion { 1197sub mouse_motion {
1115 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1116 1199
1117 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1118} 1203}
1119 1204
1120sub _draw { 1205sub _draw {
1121 my ($self) = @_; 1206 my ($self) = @_;
1122 1207
1208 my $child = $self->{children}[0];
1209
1123 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1124 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1125 1212
1126 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1127 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1128 1215
1129 my $border = $self->border; 1216 my $border = $self->border;
1130 1217
1131 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1132 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1133 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1134 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1135 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1136 1223
1137 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1138 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1139 1226
1140 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1141 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1142 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1143
1144 glColor @{ $self->{bg} };
1145
1146 $bg->{s} = $rep_x;
1147 $bg->{t} = $rep_y;
1148 $bg->{wrap_mode} = 1;
1149 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1150 } 1232 }
1151 1233
1152 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1153 1235
1154 $self->{title}->draw if $self->{title};
1155
1156 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1157} 1242}
1158 1243
1159############################################################################# 1244#############################################################################
1160 1245
1161package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1235 (sum @$hs), 1320 (sum @$hs),
1236 ) 1321 )
1237} 1322}
1238 1323
1239sub size_allocate { 1324sub size_allocate {
1240 my ($self, $w, $h, $changed) = @_; 1325 my ($self, $w, $h) = @_;
1241 1326
1242 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1243 1328
1244 my $req_w = (sum @$ws) || 1; 1329 my $req_w = (sum @$ws) || 1;
1245 my $req_h = (sum @$hs) || 1; 1330 my $req_h = (sum @$hs) || 1;
… …
1323 (List::Util::max map $_->{req_h}, @{$self->{children}}), 1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1324 ) 1409 )
1325} 1410}
1326 1411
1327sub size_allocate { 1412sub size_allocate {
1328 my ($self, $w, $h, $changed) = @_; 1413 my ($self, $w, $h) = @_;
1329 1414
1330 my $space = $self->{vertical} ? $h : $w; 1415 my $space = $self->{vertical} ? $h : $w;
1331 my $children = $self->{children}; 1416 my $children = $self->{children};
1332 1417
1333 my @req; 1418 my @req;
… …
1416 ellipsise => 3, # end 1501 ellipsise => 3, # end
1417 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1418 fontsize => 1, 1503 fontsize => 1,
1419 align => -1, 1504 align => -1,
1420 valign => -1, 1505 valign => -1,
1421 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1422 can_events => 0, 1508 can_events => 0,
1423 %arg 1509 %arg
1424 ); 1510 );
1425 1511
1426 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1453 1539
1454 delete $self->{texture}; 1540 delete $self->{texture};
1455 $self->SUPER::update; 1541 $self->SUPER::update;
1456} 1542}
1457 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1458sub set_text { 1551sub set_text {
1459 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1460 1553
1461 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1462 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1463 1556
1464 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1465 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1466 1559
1560 delete $self->{size_req};
1467 $self->realloc; 1561 $self->realloc;
1468 $self->update; 1562 $self->update;
1469} 1563}
1470 1564
1471sub set_markup { 1565sub set_markup {
… …
1477 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1478 1572
1479 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1480 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1481 1575
1576 delete $self->{size_req};
1482 $self->realloc; 1577 $self->realloc;
1483 $self->update; 1578 $self->update;
1484} 1579}
1485 1580
1486sub size_request { 1581sub size_request {
1487 my ($self) = @_; 1582 my ($self) = @_;
1488 1583
1584 $self->{size_req} ||= do {
1489 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1490 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1491 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1492 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1493 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1494 1590
1495 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1496 1592
1497 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1498 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1499 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1500 1596
1501 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1502 1598
1503 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1504 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1505 } 1604 };
1506 1605
1507 ( 1606 @{ $self->{size_req} }
1508 $w + $self->{padding} * 2,
1509 $h + $self->{padding} * 2,
1510 )
1511} 1607}
1512 1608
1513sub size_allocate { 1609sub size_allocate {
1514 my ($self, $w, $h, $changed) = @_; 1610 my ($self, $w, $h) = @_;
1611
1612 delete $self->{ox};
1515 1613
1516 delete $self->{texture} 1614 delete $self->{texture}
1517 if $changed; 1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1518} 1616}
1519 1617
1520sub set_fontsize { 1618sub set_fontsize {
1521 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1522 1620
1523 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1524 delete $self->{texture}; 1622 delete $self->{texture};
1525 1623
1526 $self->realloc; 1624 $self->realloc;
1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1527} 1633}
1528 1634
1529sub _draw { 1635sub _draw {
1530 my ($self) = @_; 1636 my ($self) = @_;
1531 1637
… …
1537 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1538 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1539 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1540 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1541 1647
1542 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1543 1650
1651 unless (exists $self->{ox}) {
1544 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1545 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1546 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1547 1655
1548 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1549 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1550 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1551
1552 $tex
1553 }; 1659 };
1554 1660
1555 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1556 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1557 1662
1558 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1559 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1560 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1561 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1562 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1563 } 1670 }
1564 1671
1565 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1566} 1673}
… …
1584 can_hover => 1, 1691 can_hover => 1,
1585 can_focus => 1, 1692 can_focus => 1,
1586 valign => 0, 1693 valign => 0,
1587 can_events => 1, 1694 can_events => 1,
1588 #text => ... 1695 #text => ...
1696 #hidden => "*",
1589 @_ 1697 @_
1590 ) 1698 )
1591} 1699}
1592 1700
1593sub _set_text { 1701sub _set_text {
… …
1595 1703
1596 delete $self->{cur_h}; 1704 delete $self->{cur_h};
1597 1705
1598 return if $self->{text} eq $text; 1706 return if $self->{text} eq $text;
1599 1707
1600 delete $self->{texture};
1601
1602 $self->{last_activity} = $::NOW; 1708 $self->{last_activity} = $::NOW;
1603 $self->{text} = $text; 1709 $self->{text} = $text;
1604 1710
1605 $text =~ s/./*/g if $self->{hidden}; 1711 $text =~ s/./*/g if $self->{hidden};
1606 $self->{layout}->set_text ("$text "); 1712 $self->{layout}->set_text ("$text ");
1713 delete $self->{size_req};
1607 1714
1608 $self->_emit (changed => $self->{text}); 1715 $self->_emit (changed => $self->{text});
1716
1717 $self->realloc;
1718 $self->update;
1609} 1719}
1610 1720
1611sub set_text { 1721sub set_text {
1612 my ($self, $text) = @_; 1722 my ($self, $text) = @_;
1613 1723
1614 $self->{cursor} = length $text; 1724 $self->{cursor} = length $text;
1615 $self->_set_text ($text); 1725 $self->_set_text ($text);
1616
1617 $self->realloc;
1618} 1726}
1619 1727
1620sub get_text { 1728sub get_text {
1621 $_[0]{text} 1729 $_[0]{text}
1622} 1730}
… …
1652 $self->{cursor} = length $text; 1760 $self->{cursor} = length $text;
1653 } elsif ($uni == 27) { 1761 } elsif ($uni == 27) {
1654 $self->_emit ('escape'); 1762 $self->_emit ('escape');
1655 } elsif ($uni) { 1763 } elsif ($uni) {
1656 substr $text, $self->{cursor}++, 0, chr $uni; 1764 substr $text, $self->{cursor}++, 0, chr $uni;
1765 } else {
1766 return 0;
1657 } 1767 }
1658 1768
1659 $self->_set_text ($text); 1769 $self->_set_text ($text);
1660 1770
1661 $self->realloc; 1771 $self->realloc;
1772
1773 1
1662} 1774}
1663 1775
1664sub focus_in { 1776sub focus_in {
1665 my ($self) = @_; 1777 my ($self) = @_;
1666 1778
… …
1681 utf8::encode $text; 1793 utf8::encode $text;
1682 $self->{cursor} = length substr $text, 0, $idx; 1794 $self->{cursor} = length substr $text, 0, $idx;
1683 1795
1684 $self->_set_text ($self->{text}); 1796 $self->_set_text ($self->{text});
1685 $self->update; 1797 $self->update;
1798
1799 1
1686} 1800}
1687 1801
1688sub mouse_motion { 1802sub mouse_motion {
1689 my ($self, $ev, $x, $y) = @_; 1803 my ($self, $ev, $x, $y) = @_;
1690# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1804# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1805
1806 0
1691} 1807}
1692 1808
1693sub _draw { 1809sub _draw {
1694 my ($self) = @_; 1810 my ($self) = @_;
1695 1811
1696 local $self->{fg} = $self->{fg}; 1812 local $self->{fg} = $self->{fg};
1697 1813
1698 if ($FOCUS == $self) { 1814 if ($FOCUS == $self) {
1699 glColor @{$self->{active_bg}}; 1815 glColor_premultiply @{$self->{active_bg}};
1700 $self->{fg} = $self->{active_fg}; 1816 $self->{fg} = $self->{active_fg};
1701 } else { 1817 } else {
1702 glColor @{$self->{bg}}; 1818 glColor_premultiply @{$self->{bg}};
1703 } 1819 }
1704 1820
1705 glEnable GL_BLEND; 1821 glEnable GL_BLEND;
1706 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1822 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1707 glBegin GL_QUADS; 1823 glBegin GL_QUADS;
1708 glVertex 0 , 0; 1824 glVertex 0 , 0;
1709 glVertex 0 , $self->{h}; 1825 glVertex 0 , $self->{h};
1710 glVertex $self->{w}, $self->{h}; 1826 glVertex $self->{w}, $self->{h};
1711 glVertex $self->{w}, 0; 1827 glVertex $self->{w}, 0;
… …
1772 } else { 1888 } else {
1773 $self->set_text ($self->{history_saveback}); 1889 $self->set_text ($self->{history_saveback});
1774 } 1890 }
1775 1891
1776 } else { 1892 } else {
1777 $self->SUPER::key_down ($ev); 1893 return $self->SUPER::key_down ($ev)
1894 }
1895
1778 } 1896 1
1779
1780} 1897}
1781 1898
1782############################################################################# 1899#############################################################################
1783 1900
1784package CFClient::UI::Button; 1901package CFClient::UI::Button;
… …
1793 1910
1794sub new { 1911sub new {
1795 my $class = shift; 1912 my $class = shift;
1796 1913
1797 $class->SUPER::new ( 1914 $class->SUPER::new (
1798 padding => 4, 1915 padding_x => 4,
1916 padding_y => 4,
1799 fg => [1, 1, 1], 1917 fg => [1, 1, 1],
1800 active_fg => [0, 0, 1], 1918 active_fg => [0, 0, 1],
1801 can_hover => 1, 1919 can_hover => 1,
1802 align => 0, 1920 align => 0,
1803 valign => 0, 1921 valign => 0,
… …
1812 my ($self, $ev, $x, $y) = @_; 1930 my ($self, $ev, $x, $y) = @_;
1813 1931
1814 $self->emit ("activate") 1932 $self->emit ("activate")
1815 if $x >= 0 && $x < $self->{w} 1933 if $x >= 0 && $x < $self->{w}
1816 && $y >= 0 && $y < $self->{h}; 1934 && $y >= 0 && $y < $self->{h};
1935
1936 1
1817} 1937}
1818 1938
1819sub _draw { 1939sub _draw {
1820 my ($self) = @_; 1940 my ($self) = @_;
1821 1941
1822 local $self->{fg} = $self->{fg}; 1942 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1823
1824 if ($GRAB == $self) {
1825 $self->{fg} = $self->{active_fg};
1826 }
1827 1943
1828 glEnable GL_TEXTURE_2D; 1944 glEnable GL_TEXTURE_2D;
1829 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1945 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1830 glColor 0, 0, 0, 1; 1946 glColor 0, 0, 0, 1;
1831 1947
… …
1850 1966
1851sub new { 1967sub new {
1852 my $class = shift; 1968 my $class = shift;
1853 1969
1854 $class->SUPER::new ( 1970 $class->SUPER::new (
1855 padding => 2, 1971 padding_x => 2,
1972 padding_y => 2,
1856 fg => [1, 1, 1], 1973 fg => [1, 1, 1],
1857 active_fg => [1, 1, 0], 1974 active_fg => [1, 1, 0],
1858 bg => [0, 0, 0, 0.2], 1975 bg => [0, 0, 0, 0.2],
1859 active_bg => [1, 1, 1, 0.5], 1976 active_bg => [1, 1, 1, 0.5],
1860 state => 0, 1977 state => 0,
… …
1864} 1981}
1865 1982
1866sub size_request { 1983sub size_request {
1867 my ($self) = @_; 1984 my ($self) = @_;
1868 1985
1869 ($self->{padding} * 2 + 6) x 2 1986 (6) x 2
1870} 1987}
1871 1988
1872sub button_down { 1989sub button_down {
1873 my ($self, $ev, $x, $y) = @_; 1990 my ($self, $ev, $x, $y) = @_;
1874 1991
1875 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1992 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1876 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1993 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1877 $self->{state} = !$self->{state}; 1994 $self->{state} = !$self->{state};
1878 $self->_emit (changed => $self->{state}); 1995 $self->_emit (changed => $self->{state});
1996 } else {
1997 return 0
1998 }
1999
1879 } 2000 1
1880} 2001}
1881 2002
1882sub _draw { 2003sub _draw {
1883 my ($self) = @_; 2004 my ($self) = @_;
1884 2005
1885 $self->SUPER::_draw; 2006 $self->SUPER::_draw;
1886 2007
1887 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2008 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1888 2009
1889 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2010 my ($w, $h) = @$self{qw(w h)};
2011
2012 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1890 2013
1891 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2014 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1892 2015
1893 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2016 my $tex = $self->{state} ? $tex[1] : $tex[0];
1894 2017
… …
2049 2172
2050 my $h1 = $self->{h} * (1 - $ycut1); 2173 my $h1 = $self->{h} * (1 - $ycut1);
2051 my $h2 = $self->{h} * (1 - $ycut2); 2174 my $h2 = $self->{h} * (1 - $ycut2);
2052 2175
2053 glEnable GL_BLEND; 2176 glEnable GL_BLEND;
2054 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2177 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2178 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2055 glEnable GL_TEXTURE_2D; 2179 glEnable GL_TEXTURE_2D;
2056 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2180 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057 2181
2058 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2182 glBindTexture GL_TEXTURE_2D, $t1->{name};
2059 glBegin GL_QUADS; 2183 glBegin GL_QUADS;
… …
2159 fg => [1, 1, 1], 2283 fg => [1, 1, 1],
2160 active_fg => [0, 0, 0], 2284 active_fg => [0, 0, 0],
2161 bg => [0, 0, 0, 0.2], 2285 bg => [0, 0, 0, 0.2],
2162 active_bg => [1, 1, 1, 0.5], 2286 active_bg => [1, 1, 1, 0.5],
2163 range => [0, 0, 100, 10, 0], 2287 range => [0, 0, 100, 10, 0],
2164 req_w => $::WIDTH / 80, 2288 min_w => $::WIDTH / 80,
2165 req_h => $::WIDTH / 80, 2289 min_h => $::WIDTH / 80,
2166 vertical => 0, 2290 vertical => 0,
2167 can_hover => 1, 2291 can_hover => 1,
2168 inner_pad => 0.02, 2292 inner_pad => 0.02,
2169 @_ 2293 @_
2170 ); 2294 );
… …
2210} 2334}
2211 2335
2212sub size_request { 2336sub size_request {
2213 my ($self) = @_; 2337 my ($self) = @_;
2214 2338
2215 my $w = $self->{req_w}; 2339 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2340}
2220 2341
2221sub button_down { 2342sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2343 my ($self, $ev, $x, $y) = @_;
2223 2344
2224 $self->SUPER::button_down ($ev, $x, $y); 2345 $self->SUPER::button_down ($ev, $x, $y);
2225 2346
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2347 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2348
2228 $self->mouse_motion ($ev, $x, $y); 2349 $self->mouse_motion ($ev, $x, $y)
2229} 2350}
2230 2351
2231sub mouse_motion { 2352sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2233 2354
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2358 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2359
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2360 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2361
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2362 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2363 } else {
2364 return 0;
2365 }
2366
2242 } 2367 1
2243} 2368}
2244 2369
2245sub update { 2370sub update {
2246 my ($self) = @_; 2371 my ($self) = @_;
2247 2372
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2373 delete $self->{knob_w};
2374 $self->SUPER::update;
2375}
2376
2377sub _draw {
2378 my ($self) = @_;
2379
2380 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2381 $self->set_value ($self->{range}[0]);
2250 2382
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2383 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2384 my $range = ($hi - $page - $lo) || 1e-100;
2253 2385
… …
2259 $value = ($value - $lo) / $range; 2391 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2392 $value = $value * $self->{scale} + $self->{offset};
2261 2393
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2394 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2395 $self->{knob_w} = $knob_w;
2264 }); 2396 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2397
2272 $self->SUPER::_draw (); 2398 $self->SUPER::_draw ();
2273 2399
2274 glScale $self->{w}, $self->{h}; 2400 glScale $self->{w}, $self->{h};
2275 2401
… …
2373 $self->{fontsize} = $fontsize; 2499 $self->{fontsize} = $fontsize;
2374 $self->reflow; 2500 $self->reflow;
2375} 2501}
2376 2502
2377sub size_allocate { 2503sub size_allocate {
2378 my ($self, $w, $h, $changed) = @_; 2504 my ($self, $w, $h) = @_;
2379 2505
2380 $self->SUPER::size_allocate ($w, $h, $changed); 2506 $self->SUPER::size_allocate ($w, $h);
2381
2382 return unless $changed;
2383 2507
2384 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2508 $self->{layout}->set_font ($self->{font}) if $self->{font};
2385 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2509 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2386 $self->{layout}->set_width ($self->{children}[0]{w}); 2510 $self->{layout}->set_width ($self->{children}[0]{w});
2511 $self->{layout}->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2387 2512
2388 $self->reflow; 2513 $self->reflow;
2389} 2514}
2390 2515
2391sub text_size { 2516sub text_size {
… …
2393 2518
2394 my $layout = $self->{layout}; 2519 my $layout = $self->{layout};
2395 2520
2396 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2521 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2397 $layout->set_width ($self->{children}[0]{w} - $indent); 2522 $layout->set_width ($self->{children}[0]{w} - $indent);
2523 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2398 $layout->set_markup ($text); 2524 $layout->set_markup ($text);
2399 2525
2400 $layout->size 2526 $layout->size
2401} 2527}
2402 2528
… …
2454 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2580 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2455 2581
2456 for (@{$self->{par}}) { 2582 for (@{$self->{par}}) {
2457 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2583 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2458 $layout->set_width ($W - $_->[3]); 2584 $layout->set_width ($W - $_->[3]);
2585 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2459 $layout->set_markup ($_->[4]); 2586 $layout->set_markup ($_->[4]);
2460 my ($w, $h) = $layout->size; 2587 my ($w, $h) = $layout->size;
2461 $_->[0] = $w + $_->[3]; 2588 $_->[0] = $w + $_->[3];
2462 $_->[1] = $h; 2589 $_->[1] = $h;
2463 } 2590 }
… …
2471 2598
2472 delete $self->{texture}; 2599 delete $self->{texture};
2473 } 2600 }
2474 2601
2475 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2602 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2476 glClearColor 0.5, 0.5, 0.5, 0; 2603 glClearColor 0, 0, 0, 0;
2477 glClear GL_COLOR_BUFFER_BIT; 2604 glClear GL_COLOR_BUFFER_BIT;
2478 2605
2479 my $top = int $self->{children}[1]{range}[0]; 2606 my $top = int $self->{children}[1]{range}[0];
2480 2607
2481 my $y0 = $top; 2608 my $y0 = $top;
… …
2495 my $h = $par->[1]; 2622 my $h = $par->[1];
2496 2623
2497 if ($y0 < $y + $h && $y < $y1) { 2624 if ($y0 < $y + $h && $y < $y1) {
2498 $layout->set_foreground (@{ $par->[2] }); 2625 $layout->set_foreground (@{ $par->[2] });
2499 $layout->set_width ($W - $par->[3]); 2626 $layout->set_width ($W - $par->[3]);
2627 $layout->set_indent (-$self->{fontsize} * $::FONTSIZE * 4);
2500 $layout->set_markup ($par->[4]); 2628 $layout->set_markup ($par->[4]);
2501 2629
2502 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2630 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2503 2631
2504 glRasterPos $par->[3], $y - $y0; 2632 glRasterPos $par->[3], $y - $y0;
… …
2516sub _draw { 2644sub _draw {
2517 my ($self) = @_; 2645 my ($self) = @_;
2518 2646
2519 glEnable GL_TEXTURE_2D; 2647 glEnable GL_TEXTURE_2D;
2520 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2648 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2521 glColor 1, 1, 1, 1; 2649 glColor 0, 0, 0, 1;
2522 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2650 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2523 glDisable GL_TEXTURE_2D; 2651 glDisable GL_TEXTURE_2D;
2524 2652
2525 $self->{children}[1]->draw; 2653 $self->{children}[1]->draw;
2526 2654
2527} 2655}
… …
2610} 2738}
2611 2739
2612sub set_tooltip_from { 2740sub set_tooltip_from {
2613 my ($self, $widget) = @_; 2741 my ($self, $widget) = @_;
2614 2742
2743 my $tooltip = $widget->{tooltip};
2744
2745 if ($ENV{CFPLUS_DEBUG} & 2) {
2746 $tooltip .= "\n\n" . (ref $widget) . "\n"
2747 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2748 . "req $widget->{req_w} $widget->{req_h}\n"
2749 . "visible $widget->{visible}";
2750 }
2751
2615 $self->add (new CFClient::UI::Label 2752 $self->add (new CFClient::UI::Label
2616 markup => $widget->{tooltip}, 2753 markup => $tooltip,
2617 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2754 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2618 fontsize => 0.8, 2755 fontsize => 0.8,
2619 fg => [0, 0, 0, 1], 2756 fg => [0, 0, 0, 1],
2620 ellipsise => 0, 2757 ellipsise => 0,
2621 font => ($widget->{tooltip_font} || $::FONT_PROP), 2758 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2629 2766
2630 ($w + 4, $h + 4) 2767 ($w + 4, $h + 4)
2631} 2768}
2632 2769
2633sub size_allocate { 2770sub size_allocate {
2634 my ($self, $w, $h, $changed) = @_; 2771 my ($self, $w, $h) = @_;
2635 2772
2636 return unless $changed;
2637
2638 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2773 $self->SUPER::size_allocate ($w - 4, $h - 4);
2639} 2774}
2640 2775
2641sub visibility_change { 2776sub visibility_change {
2642 my ($self, $visible) = @_; 2777 my ($self, $visible) = @_;
2643 2778
2644 return unless $visible; 2779 return unless $visible;
2645 2780
2646 $self->{root}->on_post_alloc ("move_$self" => sub { 2781 $self->{root}->on_post_alloc ("move_$self" => sub {
2647 my $widget = $self->{owner}; 2782 my $widget = $self->{owner}
2783 or return;
2648 2784
2649 my ($x, $y) = $widget->coord2global ($widget->{w}, 0); 2785 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2650 2786
2651 ($x, $y) = $widget->coord2global (-$self->{w}, 0) 2787 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2652 if $x + $self->{w} > $::WIDTH; 2788 if $x + $self->{w} > $::WIDTH;
2653 2789
2654 $self->move ($x, $y); 2790 $self->move_abs ($x, $y);
2655 }); 2791 });
2656} 2792}
2657 2793
2658sub _draw { 2794sub _draw {
2659 my ($self) = @_; 2795 my ($self) = @_;
… …
2746 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2882 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2747 2883
2748 if ($tex) { 2884 if ($tex) {
2749 glEnable GL_TEXTURE_2D; 2885 glEnable GL_TEXTURE_2D;
2750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2886 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2751 glColor 1, 1, 1, 1; 2887 glColor 0, 0, 0, 1;
2752 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2888 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2753 glDisable GL_TEXTURE_2D; 2889 glDisable GL_TEXTURE_2D;
2754 } 2890 }
2755} 2891}
2756 2892
… …
2763 $self->SUPER::DESTROY; 2899 $self->SUPER::DESTROY;
2764} 2900}
2765 2901
2766############################################################################# 2902#############################################################################
2767 2903
2768package CFClient::UI::Inventory; 2904package CFClient::UI::Buttonbar;
2769 2905
2770our @ISA = CFClient::UI::ScrolledWindow::; 2906our @ISA = CFClient::UI::HBox::;
2771 2907
2772sub new { 2908# TODO: should actualyl wrap buttons and other goodies.
2773 my $class = shift;
2774
2775 my $self = $class->SUPER::new (
2776 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2777 @_,
2778 );
2779
2780 $self
2781}
2782
2783sub set_items {
2784 my ($self, $items) = @_;
2785
2786 $self->{scrolled}->clear;
2787 return unless $items;
2788
2789 my @items = sort {
2790 ($a->{type} <=> $b->{type})
2791 or ($a->{name} cmp $b->{name})
2792 } @$items;
2793
2794 $self->{real_items} = \@items;
2795
2796 my $row = 0;
2797 for my $item (@items) {
2798 CFClient::Item::update_widgets $item;
2799
2800 $self->{scrolled}->add (0, $row, $item->{face_widget});
2801 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2802 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2803
2804 $row++;
2805 }
2806}
2807 2909
2808############################################################################# 2910#############################################################################
2809 2911
2810package CFClient::UI::Menu; 2912package CFClient::UI::Menu;
2811 2913
… …
2823 ); 2925 );
2824 2926
2825 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2927 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2826 2928
2827 for my $item (@{ $self->{items} }) { 2929 for my $item (@{ $self->{items} }) {
2828 my ($widget, $cb) = @$item; 2930 my ($widget, $cb, $tooltip) = @$item;
2829 2931
2830 # handle various types of items, only text for now 2932 # handle various types of items, only text for now
2831 if (!ref $widget) { 2933 if (!ref $widget) {
2832 $widget = new CFClient::UI::Label 2934 $widget = new CFClient::UI::Label
2833 can_hover => 1, 2935 can_hover => 1,
2834 can_events => 1, 2936 can_events => 1,
2835 text => $widget; 2937 text => $widget,
2938 tooltip => $tooltip
2836 } 2939 }
2837 2940
2838 $self->{item}{$widget} = $item; 2941 $self->{item}{$widget} = $item;
2839 2942
2840 $self->{vbox}->add ($widget); 2943 $self->{vbox}->add ($widget);
… …
2852 # maybe save $GRAB? must be careful about events... 2955 # maybe save $GRAB? must be careful about events...
2853 $GRAB = $self; 2956 $GRAB = $self;
2854 $self->{button} = $ev->{button}; 2957 $self->{button} = $ev->{button};
2855 2958
2856 $self->show; 2959 $self->show;
2857 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2960 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2858} 2961}
2859 2962
2860sub mouse_motion { 2963sub mouse_motion {
2861 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2862 2965
2863 # TODO: should use vbox->find_widget or so 2966 # TODO: should use vbox->find_widget or so
2864 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2967 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2865 $self->{hover} = $self->{item}{$HOVER}; 2968 $self->{hover} = $self->{item}{$HOVER};
2969
2970 0
2866} 2971}
2867 2972
2868sub button_up { 2973sub button_up {
2869 my ($self, $ev, $x, $y) = @_; 2974 my ($self, $ev, $x, $y) = @_;
2870 2975
… …
2872 undef $GRAB; 2977 undef $GRAB;
2873 $self->hide; 2978 $self->hide;
2874 2979
2875 $self->_emit ("popdown"); 2980 $self->_emit ("popdown");
2876 $self->{hover}[1]->() if $self->{hover}; 2981 $self->{hover}[1]->() if $self->{hover};
2982 } else {
2983 return 0
2984 }
2985
2877 } 2986 1
2878} 2987}
2879 2988
2880############################################################################# 2989#############################################################################
2881 2990
2882package CFClient::UI::Statusbox; 2991package CFClient::UI::Multiplexer;
2883 2992
2884our @ISA = CFClient::UI::VBox::; 2993our @ISA = CFClient::UI::Container::;
2885 2994
2886sub new { 2995sub new {
2887 my $class = shift; 2996 my $class = shift;
2888 2997
2889 $class->SUPER::new ( 2998 my $self = $class->SUPER::new (
2999 @_,
3000 );
3001
3002 $self->{current} = $self->{children}[0]
3003 if @{ $self->{children} };
3004
3005 $self
3006}
3007
3008sub add {
3009 my ($self, @widgets) = @_;
3010
3011 $self->SUPER::add (@widgets);
3012
3013 $self->{current} = $self->{children}[0]
3014 if @{ $self->{children} };
3015}
3016
3017sub set_current_page {
3018 my ($self, $page_or_widget) = @_;
3019
3020 my $widget = ref $page_or_widget
3021 ? $page_or_widget
3022 : $self->{children}[$page_or_widget];
3023
3024 $self->{current} = $widget;
3025 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3026
3027 $self->_emit (page_changed => $self->{current});
3028
3029 $self->realloc;
3030}
3031
3032sub visible_children {
3033 $_[0]{current}
3034}
3035
3036sub size_request {
3037 my ($self) = @_;
3038
3039 $self->{current}->size_request
3040}
3041
3042sub size_allocate {
3043 my ($self, $w, $h) = @_;
3044
3045 $self->{current}->configure (0, 0, $w, $h);
3046}
3047
3048sub _draw {
3049 my ($self) = @_;
3050
3051 $self->{current}->draw;
3052}
3053
3054#############################################################################
3055
3056package CFClient::UI::Notebook;
3057
3058our @ISA = CFClient::UI::VBox::;
3059
3060sub new {
3061 my $class = shift;
3062
3063 my $self = $class->SUPER::new (
3064 buttonbar => (new CFClient::UI::Buttonbar),
3065 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3066 # filter => # will be put between multiplexer and $self
3067 @_,
3068 );
3069
3070 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3071 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3072
3073 $self
3074}
3075
3076sub add {
3077 my ($self, $title, $widget, $tooltip) = @_;
3078
3079 Scalar::Util::weaken $self;
3080
3081 $self->{buttonbar}->add (new CFClient::UI::Button
3082 markup => $title,
3083 tooltip => $tooltip,
3084 on_activate => sub { $self->set_current_page ($widget) },
3085 );
3086
3087 $self->{multiplexer}->add ($widget);
3088}
3089
3090sub set_current_page {
3091 my ($self, $page) = @_;
3092
3093 $self->{multiplexer}->set_current_page ($page);
3094 $self->_emit (page_changed => $self->{multiplexer}{current});
3095}
3096
3097#############################################################################
3098
3099package CFClient::UI::Combobox;
3100
3101use utf8;
3102
3103our @ISA = CFClient::UI::Button::;
3104
3105sub new {
3106 my $class = shift;
3107
3108 my $self = $class->SUPER::new (
3109 options => [], # [title, value, tooltip], ...
3110 value => undef,
3111 @_,
3112 );
3113
3114 $self->_set_value ($self->{value});
3115
3116 $self
3117}
3118
3119sub button_down {
3120 my ($self, $ev) = @_;
3121
3122 my @menu_items;
3123
3124 for (@{ $self->{options} }) {
3125 my ($title, $value, $tooltip) = @$_;
3126
3127 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3128 }
3129
3130 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3131}
3132
3133sub _set_value {
3134 my ($self, $value) = @_;
3135
3136 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3137 or return;
3138
3139 $self->{value} = $item->[1];
3140 $self->set_markup ("$item->[0] ⇓");
3141 $self->set_tooltip ($item->[2]);
3142}
3143
3144sub set_value {
3145 my ($self, $value) = @_;
3146
3147 return unless $self->{value} ne $value;
3148
3149 $self->_set_value ($value);
3150 $self->_emit (changed => $value);
3151}
3152
3153#############################################################################
3154
3155package CFClient::UI::Statusbox;
3156
3157our @ISA = CFClient::UI::VBox::;
3158
3159sub new {
3160 my $class = shift;
3161
3162 my $self = $class->SUPER::new (
2890 fontsize => 0.8, 3163 fontsize => 0.8,
2891 @_, 3164 @_,
2892 ) 3165 );
3166
3167 Scalar::Util::weaken (my $this = $self);
3168
3169 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3170
3171 $self
2893} 3172}
2894 3173
2895sub reorder { 3174sub reorder {
2896 my ($self) = @_; 3175 my ($self) = @_;
2897 my $NOW = time; 3176 my $NOW = Time::HiRes::time;
3177
3178 # freeze display when hovering over any label
3179 return if $CFClient::UI::TOOLTIP->{owner}
3180 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3181 values %{ $self->{item} };
2898 3182
2899 while (my ($k, $v) = each %{ $self->{item} }) { 3183 while (my ($k, $v) = each %{ $self->{item} }) {
2900 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3184 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2901 } 3185 }
2902 3186
… …
2905 my @items = sort { 3189 my @items = sort {
2906 $a->{pri} <=> $b->{pri} 3190 $a->{pri} <=> $b->{pri}
2907 or $b->{id} <=> $a->{id} 3191 or $b->{id} <=> $a->{id}
2908 } values %{ $self->{item} }; 3192 } values %{ $self->{item} };
2909 3193
3194 $self->{timer}->interval (1);
3195
2910 my $count = 10 + 1; 3196 my $count = 10 + 1;
2911 for my $item (@items) { 3197 for my $item (@items) {
2912 last unless --$count; 3198 last unless --$count;
2913 3199
2914 push @widgets, $item->{label} ||= do { 3200 my $label = $item->{label} ||= do {
2915 # TODO: doesn't handle markup well (read as: at all) 3201 # TODO: doesn't handle markup well (read as: at all)
2916 my $short = $item->{count} > 1 3202 my $short = $item->{count} > 1
2917 ? "<b>$item->{count} ×</b> $item->{text}" 3203 ? "<b>$item->{count} ×</b> $item->{text}"
2918 : $item->{text}; 3204 : $item->{text};
2919 3205
… …
2927 tooltip => $item->{tooltip}, 3213 tooltip => $item->{tooltip},
2928 tooltip_font => $::FONT_PROP, 3214 tooltip_font => $::FONT_PROP,
2929 tooltip_width => 0.67, 3215 tooltip_width => 0.67,
2930 fontsize => $item->{fontsize} || $self->{fontsize}, 3216 fontsize => $item->{fontsize} || $self->{fontsize},
2931 max_w => $::WIDTH * 0.44, 3217 max_w => $::WIDTH * 0.44,
2932 fg => $item->{fg}, 3218 fg => [@{ $item->{fg} }],
2933 can_events => 1, 3219 can_events => 1,
2934 can_hover => 1 3220 can_hover => 1
2935 }; 3221 };
3222
3223 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3224 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3225 $label->update;
3226 $label->set_max_size (undef, $label->{req_h} * $diff)
3227 if $diff < 1;
3228 $self->{timer}->interval (1/30);
3229 } else {
3230 $label->{fg}[3] = $item->{fg}[3] || 1;
3231 }
3232
3233 push @widgets, $label;
2936 } 3234 }
2937 3235
2938 $self->clear; 3236 $self->clear;
2939 $self->SUPER::add (reverse @widgets); 3237 $self->SUPER::add (reverse @widgets);
2940} 3238}
… …
2945 $text =~ s/^\s+//; 3243 $text =~ s/^\s+//;
2946 $text =~ s/\s+$//; 3244 $text =~ s/\s+$//;
2947 3245
2948 return unless $text; 3246 return unless $text;
2949 3247
2950 my $timeout = time + ((delete $arg{timeout}) || 60); 3248 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2951 3249
2952 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3250 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2953 3251
2954 if (my $item = $self->{item}{$group}) { 3252 if (my $item = $self->{item}{$group}) {
2955 if ($item->{text} eq $text) { 3253 if ($item->{text} eq $text) {
… …
2985 3283
2986 $self->reorder; 3284 $self->reorder;
2987 $self->SUPER::reconfigure; 3285 $self->SUPER::reconfigure;
2988} 3286}
2989 3287
3288sub DESTROY {
3289 my ($self) = @_;
3290
3291 $self->{timer}->cancel;
3292
3293 $self->SUPER::DESTROY;
3294}
3295
2990############################################################################# 3296#############################################################################
2991 3297
3298package CFClient::UI::Inventory;
3299
3300our @ISA = CFClient::UI::ScrolledWindow::;
3301
3302sub new {
3303 my $class = shift;
3304
3305 my $self = $class->SUPER::new (
3306 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3307 @_,
3308 );
3309
3310 $self
3311}
3312
3313sub set_items {
3314 my ($self, $items) = @_;
3315
3316 $self->{child}->clear;
3317 return unless $items;
3318
3319 my @items = sort {
3320 ($a->{type} <=> $b->{type})
3321 or ($a->{name} cmp $b->{name})
3322 } @$items;
3323
3324 $self->{real_items} = \@items;
3325
3326 my $row = 0;
3327 for my $item (@items) {
3328 CFClient::Item::update_widgets $item;
3329
3330 $self->{child}->add (0, $row, $item->{face_widget});
3331 $self->{child}->add (1, $row, $item->{desc_widget});
3332 $self->{child}->add (2, $row, $item->{weight_widget});
3333
3334 $row++;
3335 }
3336}
3337
3338#############################################################################
3339
3340package CFClient::UI::BindEditor;
3341
3342our @ISA = CFClient::UI::FancyFrame::;
3343
3344sub new {
3345 my $class = shift;
3346
3347 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3348
3349 $self->add (my $vb = new CFClient::UI::VBox);
3350
3351
3352 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3353 text => "start recording",
3354 tooltip => "Start/Stops recording of actions."
3355 ."All subsequent actions after the recording started will be captured."
3356 ."The actions are displayed after the record was stopped."
3357 ."To bind the action you have to click on the 'Bind' button",
3358 on_activate => sub {
3359 unless ($self->{recording}) {
3360 $self->start;
3361 } else {
3362 $self->stop;
3363 }
3364 });
3365
3366 $vb->add (new CFClient::UI::Label text => "Actions:");
3367 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3368
3369 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3370 $vb->add (my $hb = new CFClient::UI::HBox);
3371 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3372 $hb->add (new CFClient::UI::Button
3373 text => "bind",
3374 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3375 on_activate => sub {
3376 $self->ask_for_bind;
3377 });
3378
3379 $vb->add (my $hb = new CFClient::UI::HBox);
3380 $hb->add (new CFClient::UI::Button
3381 text => "ok",
3382 expand => 1,
3383 tooltip => "This closes the binding editor and saves the binding",
3384 on_activate => sub {
3385 $self->hide;
3386 $self->commit;
3387 });
3388
3389 $hb->add (new CFClient::UI::Button
3390 text => "cancel",
3391 expand => 1,
3392 tooltip => "This closes the binding editor without saving",
3393 on_activate => sub {
3394 $self->hide;
3395 $self->{binding_cancel}->()
3396 if $self->{binding_cancel};
3397 });
3398
3399 $self->update_binding_widgets;
3400
3401 $self
3402}
3403
3404sub commit {
3405 my ($self) = @_;
3406 my ($mod, $sym, $cmds) = $self->get_binding;
3407 if ($sym != 0 && @$cmds > 0) {
3408 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3409 ."'. Don't forget 'Save Config'!");
3410 $self->{binding_change}->($mod, $sym, $cmds)
3411 if $self->{binding_change};
3412 } else {
3413 $::STATUSBOX->add ("No action bound, no key or action specified!");
3414 $self->{binding_cancel}->()
3415 if $self->{binding_cancel};
3416 }
3417}
3418
3419sub start {
3420 my ($self) = @_;
3421
3422 $self->{rec_btn}->set_text ("stop recording");
3423 $self->{recording} = 1;
3424 $self->clear_command_list;
3425 $::CONN->start_record if $::CONN;
3426}
3427
3428sub stop {
3429 my ($self) = @_;
3430
3431 $self->{rec_btn}->set_text ("start recording");
3432 $self->{recording} = 0;
3433
3434 my $rec;
3435 $rec = $::CONN->stop_record if $::CONN;
3436 return unless ref $rec eq 'ARRAY';
3437 $self->set_command_list ($rec);
3438}
3439
3440
3441sub ask_for_bind_and_commit {
3442 my ($self) = @_;
3443 $self->ask_for_bind (1);
3444}
3445
3446sub ask_for_bind {
3447 my ($self, $commit) = @_;
3448
3449 CFClient::Binder::open_binding_dialog (sub {
3450 my ($mod, $sym) = @_;
3451 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3452 $self->update_binding_widgets;
3453 $self->commit if $commit;
3454 });
3455}
3456
3457# $mod and $sym are the modifiers and key symbol
3458# $cmds is a array ref of strings (the commands)
3459# $cb is the callback that is executed on OK
3460# $ccb is the callback that is executed on CANCEL and
3461# when the binding was unsuccessful on OK
3462sub set_binding {
3463 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3464
3465 $self->clear_command_list;
3466 $self->{recording} = 0;
3467 $self->{rec_btn}->set_text ("start recording");
3468
3469 $self->{binding} = [$mod, $sym];
3470 $self->{commands} = $cmds;
3471
3472 $self->{binding_change} = $cb;
3473 $self->{binding_cancel} = $ccb;
3474
3475 $self->update_binding_widgets;
3476}
3477
3478# this is a shortcut method that asks for a binding
3479# and then just binds it.
3480sub do_quick_binding {
3481 my ($self, $cmds) = @_;
3482 $self->set_binding (undef, undef, $cmds, sub {
3483 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3484 });
3485 $self->ask_for_bind (1);
3486}
3487
3488sub update_binding_widgets {
3489 my ($self) = @_;
3490 my ($mod, $sym, $cmds) = $self->get_binding;
3491 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3492 $self->set_command_list ($cmds);
3493}
3494
3495sub get_binding {
3496 my ($self) = @_;
3497 return (
3498 $self->{binding}->[0],
3499 $self->{binding}->[1],
3500 [ grep { defined $_ } @{$self->{commands}} ]
3501 );
3502}
3503
3504sub clear_command_list {
3505 my ($self) = @_;
3506 $self->{cmdbox}->clear ();
3507}
3508
3509sub set_command_list {
3510 my ($self, $cmds) = @_;
3511
3512 $self->{cmdbox}->clear ();
3513 $self->{commands} = $cmds;
3514
3515 my $idx = 0;
3516
3517 for (@$cmds) {
3518 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3519
3520 my $i = $idx;
3521 $hb->add (new CFClient::UI::Label text => $_);
3522 $hb->add (new CFClient::UI::Button
3523 text => "delete",
3524 tooltip => "Deletes the action from the record",
3525 on_activate => sub {
3526 $self->{cmdbox}->remove ($hb);
3527 $cmds->[$i] = undef;
3528 });
3529
3530
3531 $idx++
3532 }
3533}
3534
3535#############################################################################
3536
3537package CFClient::UI::SpellList;
3538
3539our @ISA = CFClient::UI::Table::;
3540
3541sub new {
3542 my $class = shift;
3543
3544 my $self = $class->SUPER::new (
3545 binding => [],
3546 commands => [],
3547 @_,
3548 )
3549}
3550
3551my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3552 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3553my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3554 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3555my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3556 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3557
3558sub rebuild_spell_list {
3559 my ($self) = @_;
3560
3561 $CFClient::UI::ROOT->on_refresh ($self => sub {
3562 $self->clear;
3563
3564 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3565 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3566 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3567 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3568
3569 my $row = 0;
3570
3571 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3572 my $spell = $self->{spell}{$_};
3573
3574 $row++;
3575
3576 $self->add (0, $row, new CFClient::UI::Face
3577 face => $spell->{face},
3578 can_hover => 1,
3579 can_events => 1,
3580 tooltip => $spell->{message},
3581 );
3582
3583 $self->add (1, $row, new CFClient::UI::Label
3584 expand => 1,
3585 text => $spell->{name},
3586 can_hover => 1,
3587 can_events => 1,
3588 tooltip => $spell->{message},
3589 );
3590
3591 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3592 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3593 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3594
3595 # TODO: should be done via popup
3596 $self->add (5, $row, new CFClient::UI::Button
3597 text => "bind",
3598 tooltip => "bind spell readying (cast command) to key",
3599 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3600 );
3601 }
3602 });
3603}
3604
3605sub add_spell {
3606 my ($self, $spell) = @_;
3607
3608 $self->{spell}->{$spell->{name}} = $spell;
3609 $self->rebuild_spell_list;
3610}
3611
3612sub remove_spell {
3613 my ($self, $spell) = @_;
3614
3615 delete $self->{spell}->{$spell->{name}};
3616 $self->rebuild_spell_list;
3617}
3618
3619#############################################################################
3620
2992package CFClient::UI::Root; 3621package CFClient::UI::Root;
2993 3622
2994our @ISA = CFClient::UI::Container::; 3623our @ISA = CFClient::UI::Container::;
3624
3625use List::Util qw(min max);
2995 3626
2996use CFClient::OpenGL; 3627use CFClient::OpenGL;
2997 3628
2998sub new { 3629sub new {
2999 my $class = shift; 3630 my $class = shift;
… …
3006 Scalar::Util::weaken ($self->{root} = $self); 3637 Scalar::Util::weaken ($self->{root} = $self);
3007 3638
3008 $self 3639 $self
3009} 3640}
3010 3641
3011sub configure {
3012 my ($self, $x, $y, $w, $h) = @_;
3013
3014 $self->{w} = $w;
3015 $self->{h} = $h;
3016}
3017
3018sub reconfigure {
3019 my ($self) = @_;
3020
3021 $self->SUPER::reconfigure;
3022
3023 $self->size_allocate ($self->{w}, $self->{h}, 1)
3024 if $self->{w};
3025}
3026
3027sub size_request { 3642sub size_request {
3028 my ($self) = @_; 3643 my ($self) = @_;
3029 3644
3030 ($self->{w}, $self->{h}) 3645 ($self->{w}, $self->{h})
3031} 3646}
3032 3647
3648sub _to_pixel {
3649 my ($coord, $size, $max) = @_;
3650
3651 $coord =
3652 $coord eq "center" ? ($max - $size) * 0.5
3653 : $coord eq "max" ? $max
3654 : $coord;
3655
3656 $coord = 0 if $coord < 0;
3657 $coord = $max - $size if $coord > $max - $size;
3658
3659 int $coord + 0.5
3660}
3661
3033sub size_allocate { 3662sub size_allocate {
3034 my ($self, $w, $h, $changed) = @_; 3663 my ($self, $w, $h) = @_;
3035 3664
3036 for my $child ($self->children) { 3665 for my $child ($self->children) {
3037 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3666 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3038 3667
3039 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3668 $X = $child->{force_x} if exists $child->{force_x};
3040 if exists $child->{req_x}; 3669 $Y = $child->{force_y} if exists $child->{force_y};
3041 3670
3042 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3671 $X = _to_pixel $X, $W, $self->{w};
3043 if exists $child->{req_y}; 3672 $Y = _to_pixel $Y, $H, $self->{h};
3044
3045 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3046
3047 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3048 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3049 3673
3050 $child->configure ($X, $Y, $W, $H); 3674 $child->configure ($X, $Y, $W, $H);
3051 } 3675 }
3052} 3676}
3053 3677
… …
3070} 3694}
3071 3695
3072sub add { 3696sub add {
3073 my ($self, @children) = @_; 3697 my ($self, @children) = @_;
3074 3698
3075 for my $child (@children) {
3076 $child->{is_toplevel} = 1; 3699 $_->{is_toplevel} = 1
3077 3700 for @children;
3078 # integerise window positions
3079 $child->{x} = int $child->{x};
3080 $child->{y} = int $child->{y};
3081 }
3082 3701
3083 $self->SUPER::add (@children); 3702 $self->SUPER::add (@children);
3084} 3703}
3085 3704
3086sub remove { 3705sub remove {
3087 my ($self, @children) = @_; 3706 my ($self, @children) = @_;
3088 3707
3089 $self->SUPER::remove (@children); 3708 $self->SUPER::remove (@children);
3709
3710 delete $self->{is_toplevel}
3711 for @children;
3090 3712
3091 while (@children) { 3713 while (@children) {
3092 my $w = pop @children; 3714 my $w = pop @children;
3093 push @children, $w->children; 3715 push @children, $w->children;
3094 $w->set_invisible; 3716 $w->set_invisible;
… …
3114 $_->() 3736 $_->()
3115 for values %{delete $self->{refresh_hook}}; 3737 for values %{delete $self->{refresh_hook}};
3116 } 3738 }
3117 3739
3118 if ($self->{realloc}) { 3740 if ($self->{realloc}) {
3741 my %queue;
3119 my @queue; 3742 my @queue;
3743 my $widget;
3120 3744
3745 outer:
3121 while () { 3746 while () {
3122 if ($self->{realloc}) { 3747 if (my $realloc = delete $self->{realloc}) {
3123 #TODO use array-of-depth approach 3748 for $widget (values %$realloc) {
3749 $widget->{visible} or next; # do not resize invisible widgets
3124 3750
3125 @queue = sort { $a->{visible} <=> $b->{visible} } 3751 $queue{$widget+0}++ and next; # duplicates are common
3126 @queue, values %{delete $self->{realloc}}; 3752
3753 push @{ $queue[$widget->{visible}] }, $widget;
3754 }
3127 } 3755 }
3128 3756
3757 while () {
3758 @queue or last outer;
3759
3760 $widget = pop @{ $queue[-1] || [] }
3761 and last;
3762
3763 pop @queue;
3764 }
3765
3766 delete $queue{$widget+0};
3767
3768 my ($w, $h) = $widget->size_request;
3769
3770 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3771 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3772
3773 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3774 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3775
3776 $w = $widget->{force_w} if exists $widget->{force_w};
3777 $h = $widget->{force_h} if exists $widget->{force_h};
3778
3779 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3780 || delete $widget->{force_realloc}) {
3781 $widget->{req_w} = $w;
3782 $widget->{req_h} = $h;
3783
3784 $self->{size_alloc}{$widget+0} = $widget;
3785
3786 if (my $parent = $widget->{parent}) {
3787 $self->{realloc}{$parent+0} = $parent
3788 unless $queue{$parent+0};
3789
3790 $parent->{force_size_alloc} = 1;
3791 $self->{size_alloc}{$parent+0} = $parent;
3792 }
3793 }
3794
3795 delete $self->{realloc}{$widget+0};
3796 }
3797 }
3798
3799 while (my $size_alloc = delete $self->{size_alloc}) {
3800 my @queue = sort { $b->{visible} <=> $a->{visible} }
3801 values %$size_alloc;
3802
3803 while () {
3129 my $widget = pop @queue || last; 3804 my $widget = pop @queue || last;
3130 3805
3131 $widget->{visible} or last; # do not resize invisible widgets 3806 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3132
3133 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3134 ? @$widget{qw(def_w def_h)}
3135 : $widget->size_request;
3136
3137 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3138
3139 $widget->{req_w} = $w;
3140 $widget->{req_h} = $h;
3141
3142 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
3143
3144 push @queue, $widget->{parent}
3145 if $widget->{parent};
3146 }
3147 }
3148
3149 while (my $size_alloc = delete $self->{size_alloc}) {
3150 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible},
3151 values %$size_alloc;
3152
3153 while () {
3154 my ($widget, $w, $h) = @{ pop @queue or last };
3155 3807
3156 $w = 0 if $w < 0; 3808 $w = 0 if $w < 0;
3157 $h = 0 if $h < 0; 3809 $h = 0 if $h < 0;
3158 3810
3159 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3811 $w = int $w + 0.5;
3812 $h = int $h + 0.5;
3160 3813
3814 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3815 $widget->{old_w} = $widget->{w};
3816 $widget->{old_h} = $widget->{h};
3817
3161 $widget->{w} = $w; 3818 $widget->{w} = $w;
3162 $widget->{h} = $h; 3819 $widget->{h} = $h;
3163 3820
3164 $widget->emit (size_allocate => $w, $h, $changed); 3821 $widget->emit (size_allocate => $w, $h);
3822 }
3165 } 3823 }
3166 } 3824 }
3167 3825
3168 while ($self->{post_alloc_hook}) { 3826 while ($self->{post_alloc_hook}) {
3169 $_->() 3827 $_->()
3170 for values %{delete $self->{post_alloc_hook}}; 3828 for values %{delete $self->{post_alloc_hook}};
3171 } 3829 }
3830
3172 3831
3173 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3832 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3174 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3833 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3175 glClear GL_COLOR_BUFFER_BIT; 3834 glClear GL_COLOR_BUFFER_BIT;
3176 3835
… …
3178 glLoadIdentity; 3837 glLoadIdentity;
3179 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3838 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3180 glMatrixMode GL_MODELVIEW; 3839 glMatrixMode GL_MODELVIEW;
3181 glLoadIdentity; 3840 glLoadIdentity;
3182 3841
3842 {
3843 package CFClient::UI::Base;
3844
3845 ($draw_x, $draw_y, $draw_w, $draw_h) =
3846 (0, 0, $self->{w}, $self->{h});
3847 }
3848
3183 $self->_draw; 3849 $self->_draw;
3184} 3850}
3185 3851
3186############################################################################# 3852#############################################################################
3187 3853

Diff Legend

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