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

Diff Legend

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