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.250 by root, Sun May 28 02:31:03 2006 UTC vs.
Revision 1.304 by elmex, Tue Jun 13 11:01:04 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 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 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;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $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.]+$/;
181 $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};
182 $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
183 } 190 }
184 } 191 }
185 192
186 reconfigure_widgets; 193 reconfigure_widgets;
187} 194}
… …
196 203
197sub new { 204sub new {
198 my $class = shift; 205 my $class = shift;
199 206
200 my $self = bless { 207 my $self = bless {
201 x => 0, 208 x => "center",
202 y => 0, 209 y => "center",
203 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
204 can_events => 1, 213 can_events => 1,
205 @_ 214 @_
206 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
207 218
208 for (keys %$self) { 219 for (keys %$self) {
209 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
210 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
211 } 222 }
212 } 223 }
213 224
214 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
215
216 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
217 $self->{req_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
218 $self->{req_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
219 $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};
220 $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};
221 } 235 }
222 236
223 $self 237 $self
224} 238}
225 239
… …
236 return if $self->{parent}; 250 return if $self->{parent};
237 251
238 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
239} 253}
240 254
241sub center {
242 my ($self) = @_;
243
244 $CFClient::UI::ROOT->on_post_alloc (
245 "center_$self" => sub {
246 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
247 },
248 );
249
250 $self->update;
251}
252
253sub set_visible { 255sub set_visible {
254 my ($self) = @_; 256 my ($self) = @_;
255 257
256 return if $self->{visible}; 258 return if $self->{visible};
257 259
258 $self->{root} = $self->{parent}{root}; 260 $self->{root} = $self->{parent}{root};
259 $self->{visible} = $self->{parent}{visible} + 1; 261 $self->{visible} = $self->{parent}{visible} + 1;
260 262
261 $self->emit (visibility_change => 1); 263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
262} 268}
263 269
264sub set_invisible { 270sub set_invisible {
265 my ($self) = @_; 271 my ($self) = @_;
266 272
267 return unless $self->{visible}; 273 return unless $self->{visible};
268 274
269 # broken show/hide model 275 $_->set_invisible for $self->children;
270 276
277 delete $self->{visible};
271 delete $self->{root}; 278 delete $self->{root};
272 delete $self->{visible};
273 279
274 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
275 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
276 282
277 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
278 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
279 285
280 $self->focus_out; 286 $self->focus_out;
281 287
282 $self->emit (visibility_change => 0); 288 $self->emit (visibility_change => 0);
283} 289}
… …
306 312
307 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
308 if $self->{parent}; 314 if $self->{parent};
309} 315}
310 316
311sub move { 317sub move_abs {
312 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
313 319
314 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
315 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
316 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
317 323
318 $self->update; 324 $self->update;
319} 325}
320 326
321sub set_size { 327sub set_size {
322 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
323 329
324 $self->{def_w} = $w; 330 $self->{force_w} = $w;
325 $self->{def_h} = $h; 331 $self->{force_h} = $h;
326 332
327 $self->check_size; 333 $self->realloc;
328} 334}
329 335
330sub size_request { 336sub size_request {
331 require Carp; 337 require Carp;
332 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
334 340
335sub configure { 341sub configure {
336 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
337 343
338 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
339 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
340 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
341 349
342 # use alignment to adjust x, y 350 # use alignment to adjust x, y
343 351
344 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
345 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
346
347 ($w, $h) = ($w2, $h2);
348 } 354 }
349 355
350 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
351 $self->{x} = $x; 357 $self->{x} = $x;
352 $self->{y} = $y; 358 $self->{y} = $y;
353 $self->update; 359 $self->update;
354 } 360 }
355 361
356 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
357 $CFClient::UI::ROOT->{size_alloc}{$self+0} = [$self, $w, $h]; 363 return unless $self->{visible};
364
365 $self->{alloc_w} = $w;
366 $self->{alloc_h} = $h;
367
368 $self->{root}{size_alloc}{$self+0} = $self;
358 } 369 }
359} 370}
360 371
361sub size_allocate { 372sub size_allocate {
362 # nothing to be done 373 # nothing to be done
363} 374}
364 375
365sub reconfigure {
366 my ($self) = @_;
367
368 $self->check_size (1);
369 $self->update;
370}
371
372sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
373} 382}
374 383
375sub set_max_size { 384sub set_max_size {
376 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
377 386
378 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
379 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
380} 391}
381 392
382sub set_tooltip { 393sub set_tooltip {
383 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
384 395
… …
389 400
390 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
391 402
392 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
393 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
394 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
395 } 406 }
396} 407}
397 408
398# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
399sub coord2local { 410sub coord2local {
… …
436 447
437 $::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
438 unless $FOCUS; 449 unless $FOCUS;
439} 450}
440 451
441sub mouse_motion { } 452sub mouse_motion { 0 }
442sub button_up { } 453sub button_up { 0 }
443sub key_down { } 454sub key_down { 0 }
444sub key_up { } 455sub key_up { 0 }
445 456
446sub button_down { 457sub button_down {
447 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
448 459
449 $self->focus_in; 460 $self->focus_in;
450}
451 461
452sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
453sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
454sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
455sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
456sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
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
457 538
458sub draw { 539sub draw {
459 my ($self) = @_; 540 my ($self) = @_;
460 541
461 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);
462 553
463 glPushMatrix; 554 glPushMatrix;
464 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
465 $self->_draw;
466 glPopMatrix;
467 556
468 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
469 my ($x, $y) = @$self{qw(x y)};
470
471 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
472 glEnable GL_BLEND; 559 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
474 glBegin GL_QUADS; 561 glBegin GL_QUADS;
475 glVertex $x , $y; 562 glVertex 0 , 0;
476 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
477 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
478 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
479 glEnd; 566 glEnd;
480 glDisable GL_BLEND; 567 glDisable GL_BLEND;
481 } 568 }
482 569
483 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
484 glPushMatrix; 571 glPushMatrix;
485 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
486 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
487 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
488 glVertex 0 , 0; 575 glVertex 0 , 0;
489 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
490 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
491 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
492 glEnd; 579 glEnd;
493 glPopMatrix; 580 glPopMatrix;
494 #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;
495 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
496} 586}
497 587
498sub _draw { 588sub _draw {
499 my ($self) = @_; 589 my ($self) = @_;
500 590
501 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
502} 592}
503 593
504sub find_widget {
505 my ($self, $x, $y) = @_;
506
507 return () unless $self->{can_events};
508
509 return $self
510 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
511 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
512
513 ()
514}
515
516sub set_parent {
517 my ($self, $parent) = @_;
518
519 Scalar::Util::weaken ($self->{parent} = $parent);
520
521 $self->set_visible; #TODO why breakssssss borked damn if $parent->{visible};
522
523 $self->check_size;
524}
525
526sub check_size {
527 my ($self, $forced) = @_;
528
529 $self->{force_alloc} = 1 if $forced;
530 $CFClient::UI::ROOT->{check_size}{$self} = $self;
531}
532
533sub update {
534 my ($self) = @_;
535
536 $self->{parent}->update
537 if $self->{parent};
538}
539
540sub connect {
541 my ($self, $signal, $cb) = @_;
542
543 push @{ $self->{signal_cb}{$signal} }, $cb;
544}
545
546sub _emit {
547 my ($self, $signal, @args) = @_;
548
549 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
550}
551
552sub emit {
553 my ($self, $signal, @args) = @_;
554
555 $self->_emit ($signal, @args)
556 || $self->$signal (@args);
557}
558
559sub visibility_change {
560 #my ($self, $visible) = @_;
561}
562
563sub DESTROY { 594sub DESTROY {
564 my ($self) = @_; 595 my ($self) = @_;
565 596
566 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
567 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
568} 601}
569 602
570############################################################################# 603#############################################################################
571 604
572package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
597 630
598 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
599 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
600 633
601 glEnable GL_BLEND; 634 glEnable GL_BLEND;
602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
603 glColor @$color; 636 glColor_premultiply @$color;
604 637
605 glBegin GL_QUADS; 638 glBegin GL_QUADS;
606 glVertex 0 , 0; 639 glVertex 0 , 0;
607 glVertex 0 , $h; 640 glVertex 0 , $h;
608 glVertex $w, $h; 641 glVertex $w, $h;
… …
623 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
624 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
625} 658}
626 659
627sub size_request { 660sub size_request {
628 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
629} 664}
630 665
631sub draw { } 666sub draw { }
632 667
633############################################################################# 668#############################################################################
… …
637our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
638 673
639sub new { 674sub new {
640 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
641 676
642 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
643 678
644 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
645 children => [], 680 children => [],
646 can_events => 0, 681 can_events => 0,
647 %arg, 682 %arg,
648 ); 683 );
684
649 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
650 687
651 $self 688 $self
652} 689}
653 690
654sub add { 691sub add {
… …
662 $self->{children} = [ 699 $self->{children} = [
663 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
664 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
665 ]; 702 ];
666 703
667 $self->check_size (1); 704 $self->realloc;
668 $self->update;
669} 705}
670 706
671sub children { 707sub children {
672 @{ $_[0]{children} } 708 @{ $_[0]{children} }
673} 709}
… …
678 delete $child->{parent}; 714 delete $child->{parent};
679 $child->hide; 715 $child->hide;
680 716
681 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
682 718
683 $self->check_size (1); 719 $self->realloc;
684 $self->update;
685} 720}
686 721
687sub clear { 722sub clear {
688 my ($self) = @_; 723 my ($self) = @_;
689 724
… …
693 for (@$children) { 728 for (@$children) {
694 delete $_->{parent}; 729 delete $_->{parent};
695 $_->hide; 730 $_->hide;
696 } 731 }
697 732
698 $self->check_size; 733 $self->realloc;
699 $self->update;
700} 734}
701 735
702sub find_widget { 736sub find_widget {
703 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
704 738
705 $x -= $self->{x}; 739 $x -= $self->{x};
706 $y -= $self->{y}; 740 $y -= $self->{y};
707 741
708 my $res; 742 my $res;
709 743
710 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
711 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
712 and return $res; 746 and return $res;
713 } 747 }
714 748
715 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
736} 770}
737 771
738sub add { 772sub add {
739 my ($self, $child) = @_; 773 my ($self, $child) = @_;
740 774
741 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
742
743 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
744} 777}
745 778
746sub remove { 779sub remove {
747 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
764 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
765} 798}
766 799
767############################################################################# 800#############################################################################
768 801
802# back-buffered drawing area
803
769package CFClient::UI::Window; 804package CFClient::UI::Window;
770 805
771our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
772 807
773use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
791 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
792 $self->update; 827 $self->update;
793} 828}
794 829
795sub _render { 830sub _render {
831 my ($self) = @_;
832
796 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
797} 834}
798 835
799sub render_child { 836sub render_child {
800 my ($self) = @_; 837 my ($self) = @_;
801 838
802 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
803 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
804 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
805 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
806 $self->_render; 850 $self->_render;
807 }; 851 };
808} 852}
809 853
810sub _draw { 854sub _draw {
811 my ($self) = @_; 855 my ($self) = @_;
812 856
813 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
814 858
815 my $tex = $self->{texture} 859 my $tex = $self->{texture}
816 or return; 860 or return;
817 861
818 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
819 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
820 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
821 865
822 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
823 867
824 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
825} 869}
… …
841} 885}
842 886
843sub size_request { 887sub size_request {
844 my ($self) = @_; 888 my ($self) = @_;
845 889
846 my ($w, $h) = @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
847 891
848 $w = 10 if $self->{scroll_x}; 892 $w = 10 if $self->{scroll_x};
849 $h = 10 if $self->{scroll_y}; 893 $h = 10 if $self->{scroll_y};
850 894
851 ($w, $h) 895 ($w, $h)
852} 896}
853 897
854sub size_allocate { 898sub size_allocate {
855 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
856 900
901 my $child = $self->child;
902
857 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
858 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
859 905
860 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
861 $self->update; 907 $self->update;
862} 908}
863 909
… …
899} 945}
900 946
901sub _render { 947sub _render {
902 my ($self) = @_; 948 my ($self) = @_;
903 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
904 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
905 954
906 $self->SUPER::_render; 955 $self->SUPER::_render;
907} 956}
908 957
… …
911package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
912 961
913our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
914 963
915sub new { 964sub new {
916 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
917 968
918 my $self; 969 my $self;
919 970
920 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
921 vertical => 1, 972 vertical => 1,
… …
926 ; 977 ;
927 978
928 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
929 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
930 slider => $slider, 981 slider => $slider,
931 @_, 982 %arg,
932 ); 983 );
933 984
934 $self->{vp}->add ($self->{scrolled});
935 $self->add ($self->{vp});
936 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
937 987
938 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
939} 995}
940 996
941sub update { 997sub update {
942 my ($self) = @_; 998 my ($self) = @_;
943 999
… …
982 1038
983 if ($self->{bg}) { 1039 if ($self->{bg}) {
984 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
985 1041
986 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
988 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
989 1045
990 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
991 glVertex 0 , 0; 1047 glVertex 0 , 0;
992 glVertex 0 , $h; 1048 glVertex 0 , $h;
993 glVertex $w, $h; 1049 glVertex $w, $h;
… …
1006 1062
1007our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
1008 1064
1009use CFClient::OpenGL; 1065use CFClient::OpenGL;
1010 1066
1011my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
1012 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1013 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1014 1074
1015sub new { 1075sub new {
1016 my $class = shift; 1076 my ($class, %arg) = @_;
1017 1077
1018 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
1019 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
1020 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
1021 border => 0.6, 1081 border => 0.6,
1022 is_toplevel => 1,
1023 can_events => 1, 1082 can_events => 1,
1024 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
1025 ); 1086 );
1026 1087
1027 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
1028 align => 0, 1089 align => 0,
1029 valign => 1, 1090 valign => 1,
1030 text => $self->{title}, 1091 text => $self->{title},
1031 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
1094
1095 unless ($self->{no_close_button}) {
1096 $self->{close_btn} =
1097 new CFClient::UI::ImageButton
1098 image => 'x1_close.png',
1099 on_activate => sub { $self->hide };
1100
1101 $self->CFClient::UI::Container::add ($self->{close_btn});
1102 }
1032 1103
1033 $self 1104 $self
1105}
1106
1107sub add {
1108 my ($self, @widgets) = @_;
1109
1110 $self->SUPER::add (@widgets);
1111 $self->CFClient::UI::Container::add ($self->{close_btn}) if $self->{close_btn};
1112 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1034} 1113}
1035 1114
1036sub border { 1115sub border {
1037 int $_[0]{border} * $::FONTSIZE 1116 int $_[0]{border} * $::FONTSIZE
1038} 1117}
1039 1118
1040sub size_request { 1119sub size_request {
1041 my ($self) = @_; 1120 my ($self) = @_;
1121
1122 $self->{title_widget}->size_request
1123 if $self->{title_widget};
1124
1125 $self->{close_btn}->size_request
1126 if $self->{close_btn};
1042 1127
1043 my ($w, $h) = $self->SUPER::size_request; 1128 my ($w, $h) = $self->SUPER::size_request;
1044 1129
1045 ( 1130 (
1046 $w + $self->border * 2, 1131 $w + $self->border * 2,
… …
1049} 1134}
1050 1135
1051sub size_allocate { 1136sub size_allocate {
1052 my ($self, $w, $h) = @_; 1137 my ($self, $w, $h) = @_;
1053 1138
1139 if ($self->{title_widget}) {
1140 $self->{title_widget}{w} = $w;
1141 $self->{title_widget}{h} = $h;
1142 $self->{title_widget}->size_allocate ($w, $h);
1143 }
1144
1145 my $border = $self->border;
1146
1054 $h -= List::Util::max 0, $self->border * 2; 1147 $h -= List::Util::max 0, $border * 2;
1055 $w -= List::Util::max 0, $self->border * 2; 1148 $w -= List::Util::max 0, $border * 2;
1056 1149
1057 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1058 if $self->{title};
1059
1060 $self->child->configure ($self->border, $self->border, $w, $h); 1150 $self->child->configure ($border, $border, $w, $h);
1151
1152 $self->{close_btn}->configure ($self->{w} - (2 * $border), 0, $border, $border)
1153 if $self->{close_btn};
1061} 1154}
1062 1155
1063sub button_down { 1156sub button_down {
1064 my ($self, $ev, $x, $y) = @_; 1157 my ($self, $ev, $x, $y) = @_;
1065 1158
… …
1081 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
1082 1175
1083 my $dx = $ev->{x} - $ox; 1176 my $dx = $ev->{x} - $ox;
1084 my $dy = $ev->{y} - $oy; 1177 my $dy = $ev->{y} - $oy;
1085 1178
1086 $self->{user_x} = $wx + $dx * $mx;
1087 $self->{user_y} = $wy + $dy * $my;
1088 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1179 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1089 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1180 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1090 $self->move ($self->{user_x}, $self->{user_y}); 1181
1091 $self->check_size; 1182 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1183 $self->realloc;
1092 }; 1184 };
1093 1185
1094 } elsif ($lr ^ $td) { 1186 } elsif ($lr ^ $td) {
1095 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1187 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1096 my ($bx, $by) = ($self->{x}, $self->{y}); 1188 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1098 $self->{motion} = sub { 1190 $self->{motion} = sub {
1099 my ($ev, $x, $y) = @_; 1191 my ($ev, $x, $y) = @_;
1100 1192
1101 ($x, $y) = ($ev->{x}, $ev->{y}); 1193 ($x, $y) = ($ev->{x}, $ev->{y});
1102 1194
1103 $self->{user_x} = $bx + $x - $ox; 1195 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1104 $self->{user_y} = $by + $y - $oy; 1196 # HACK: the next line is required to enforce placement
1105 1197 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1106 $self->move ($self->{user_x}, $self->{user_y});
1107 $self->update;
1108 }; 1198 };
1199 } else {
1200 return 0;
1201 }
1202
1109 } 1203 1
1110} 1204}
1111 1205
1112sub button_up { 1206sub button_up {
1113 my ($self, $ev, $x, $y) = @_; 1207 my ($self, $ev, $x, $y) = @_;
1114 1208
1209 $self->{close_btn}->button_up ($ev, $x, $y)
1210 if $self->{close_btn};
1211
1115 delete $self->{motion}; 1212 !!delete $self->{motion}
1116} 1213}
1117 1214
1118sub mouse_motion { 1215sub mouse_motion {
1119 my ($self, $ev, $x, $y) = @_; 1216 my ($self, $ev, $x, $y) = @_;
1120 1217
1121 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1218 $self->{motion}->($ev, $x, $y) if $self->{motion};
1219
1220 !!$self->{motion}
1122} 1221}
1123 1222
1124sub _draw { 1223sub _draw {
1125 my ($self) = @_; 1224 my ($self) = @_;
1126 1225
1226 my $child = $self->{children}[0];
1227
1127 my ($w, $h ) = ($self->{w}, $self->{h}); 1228 my ($w, $h ) = ($self->{w}, $self->{h});
1128 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1229 my ($cw, $ch) = ($child->{w}, $child->{h});
1129 1230
1130 glEnable GL_TEXTURE_2D; 1231 glEnable GL_TEXTURE_2D;
1131 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1232 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1132 1233
1133 my $border = $self->border; 1234 my $border = $self->border;
1134 1235
1135 glColor @{ $self->{border_bg} }; 1236 glColor @{ $self->{border_bg} };
1136 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1237 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1137 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1238 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1138 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1239 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1139 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1240 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1140 1241
1141 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1242 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1142 my $bg = $tex[0]; 1243 glColor @{ $self->{bg} };
1143 1244
1144 # TODO: repeat texture not scale 1245 # TODO: repeat texture not scale
1246 # solve this better(?)
1145 my $rep_x = $cw / $bg->{w}; 1247 $bg->{s} = $cw / $bg->{w};
1146 my $rep_y = $ch / $bg->{h}; 1248 $bg->{t} = $ch / $bg->{h};
1147
1148 glColor @{ $self->{bg} };
1149
1150 $bg->{s} = $rep_x;
1151 $bg->{t} = $rep_y;
1152 $bg->{wrap_mode} = 1;
1153 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1249 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1154 } 1250 }
1155 1251
1156 glDisable GL_TEXTURE_2D; 1252 glDisable GL_TEXTURE_2D;
1157 1253
1158 $self->{title}->draw if $self->{title};
1159
1160 $self->child->draw; 1254 $child->draw;
1255
1256 if ($self->{title_widget}) {
1257 glTranslate 0, $border - $self->{h};
1258 $self->{title_widget}->_draw;
1259
1260 glTranslate 0, - ($border - $self->{h});
1261 }
1262
1263 $self->{close_btn}->draw
1264 if $self->{close_btn};
1161} 1265}
1162 1266
1163############################################################################# 1267#############################################################################
1164 1268
1165package CFClient::UI::Table; 1269package CFClient::UI::Table;
… …
1187 my ($self, $x, $y, $child) = @_; 1291 my ($self, $x, $y, $child) = @_;
1188 1292
1189 $child->set_parent ($self); 1293 $child->set_parent ($self);
1190 $self->{children}[$y][$x] = $child; 1294 $self->{children}[$y][$x] = $child;
1191 1295
1192 $self->check_size (1); 1296 $self->realloc;
1297}
1298
1299sub remove {
1300 my ($self, $child) = @_;
1301
1302 # TODO: not yet implemented
1193} 1303}
1194 1304
1195# TODO: move to container class maybe? send children a signal on removal? 1305# TODO: move to container class maybe? send children a signal on removal?
1196sub clear { 1306sub clear {
1197 my ($self) = @_; 1307 my ($self) = @_;
… …
1202 for (@children) { 1312 for (@children) {
1203 delete $_->{parent}; 1313 delete $_->{parent};
1204 $_->hide; 1314 $_->hide;
1205 } 1315 }
1206 1316
1207 $self->check_size (1); 1317 $self->realloc;
1208 $self->update;
1209} 1318}
1210 1319
1211sub get_wh { 1320sub get_wh {
1212 my ($self) = @_; 1321 my ($self) = @_;
1213 1322
… …
1421 ellipsise => 3, # end 1530 ellipsise => 3, # end
1422 layout => (new CFClient::Layout), 1531 layout => (new CFClient::Layout),
1423 fontsize => 1, 1532 fontsize => 1,
1424 align => -1, 1533 align => -1,
1425 valign => -1, 1534 valign => -1,
1426 padding => 2, 1535 padding_x => 2,
1536 padding_y => 2,
1427 can_events => 0, 1537 can_events => 0,
1428 %arg 1538 %arg
1429 ); 1539 );
1430 1540
1431 if (exists $self->{template}) { 1541 if (exists $self->{template}) {
… …
1458 1568
1459 delete $self->{texture}; 1569 delete $self->{texture};
1460 $self->SUPER::update; 1570 $self->SUPER::update;
1461} 1571}
1462 1572
1573sub realloc {
1574 my ($self) = @_;
1575
1576 delete $self->{ox};
1577 $self->SUPER::realloc;
1578}
1579
1463sub set_text { 1580sub set_text {
1464 my ($self, $text) = @_; 1581 my ($self, $text) = @_;
1465 1582
1466 return if $self->{text} eq "T$text"; 1583 return if $self->{text} eq "T$text";
1467 $self->{text} = "T$text"; 1584 $self->{text} = "T$text";
1468 1585
1469 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1586 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1470 $self->{layout}->set_text ($text); 1587 $self->{layout}->set_text ($text);
1471 1588
1589 delete $self->{size_req};
1590 $self->realloc;
1472 $self->update; 1591 $self->update;
1473 $self->check_size;
1474} 1592}
1475 1593
1476sub set_markup { 1594sub set_markup {
1477 my ($self, $markup) = @_; 1595 my ($self, $markup) = @_;
1478 1596
… …
1482 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1600 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1483 1601
1484 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1602 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1485 $self->{layout}->set_markup ($markup); 1603 $self->{layout}->set_markup ($markup);
1486 1604
1605 delete $self->{size_req};
1606 $self->realloc;
1487 $self->update; 1607 $self->update;
1488 $self->check_size;
1489} 1608}
1490 1609
1491sub size_request { 1610sub size_request {
1492 my ($self) = @_; 1611 my ($self) = @_;
1493 1612
1613 $self->{size_req} ||= do {
1494 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1614 $self->{layout}->set_font ($self->{font}) if $self->{font};
1495 $self->{layout}->set_width ($self->{max_w} || -1); 1615 $self->{layout}->set_width ($self->{max_w} || -1);
1496 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1616 $self->{layout}->set_ellipsise ($self->{ellipsise});
1497 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1617 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1498 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1618 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1499 1619
1500 my ($w, $h) = $self->{layout}->size; 1620 my ($w, $h) = $self->{layout}->size;
1501 1621
1502 if (exists $self->{template}) { 1622 if (exists $self->{template}) {
1503 $self->{template}->set_font ($self->{font}) if $self->{font}; 1623 $self->{template}->set_font ($self->{font}) if $self->{font};
1504 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1624 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1505 1625
1506 my ($w2, $h2) = $self->{template}->size; 1626 my ($w2, $h2) = $self->{template}->size;
1507 1627
1508 $w = List::Util::max $w, $w2; 1628 $w = List::Util::max $w, $w2;
1509 $h = List::Util::max $h, $h2; 1629 $h = List::Util::max $h, $h2;
1630 }
1631
1632 [$w, $h]
1510 } 1633 };
1511 1634
1512 ( 1635 @{ $self->{size_req} }
1513 $w + $self->{padding} * 2,
1514 $h + $self->{padding} * 2,
1515 )
1516} 1636}
1517 1637
1518sub size_allocate { 1638sub size_allocate {
1519 my ($self, $w, $h) = @_; 1639 my ($self, $w, $h) = @_;
1520 1640
1641 delete $self->{ox};
1642
1521 delete $self->{texture}; 1643 delete $self->{texture}
1644 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1522} 1645}
1523 1646
1524sub set_fontsize { 1647sub set_fontsize {
1525 my ($self, $fontsize) = @_; 1648 my ($self, $fontsize) = @_;
1526 1649
1527 $self->{fontsize} = $fontsize; 1650 $self->{fontsize} = $fontsize;
1528 delete $self->{texture}; 1651 delete $self->{texture};
1529 1652
1530 $self->update; 1653 $self->realloc;
1531 $self->check_size; 1654}
1655
1656sub reconfigure {
1657 my ($self) = @_;
1658
1659 delete $self->{size_req};
1660
1661 $self->SUPER::reconfigure;
1532} 1662}
1533 1663
1534sub _draw { 1664sub _draw {
1535 my ($self) = @_; 1665 my ($self) = @_;
1536 1666
… …
1542 $self->{layout}->set_width ($self->{w}); 1672 $self->{layout}->set_width ($self->{w});
1543 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1673 $self->{layout}->set_ellipsise ($self->{ellipsise});
1544 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1674 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1545 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1675 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1546 1676
1547 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1677 new_from_layout CFClient::Texture $self->{layout}
1678 };
1548 1679
1680 unless (exists $self->{ox}) {
1549 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1681 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1550 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1682 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1551 : ($self->{w} - $tex->{w}) * 0.5); 1683 : ($self->{w} - $tex->{w}) * 0.5);
1552 1684
1553 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1685 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1554 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1686 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1555 : ($self->{h} - $tex->{h}) * 0.5); 1687 : ($self->{h} - $tex->{h}) * 0.5);
1556
1557 $tex
1558 }; 1688 };
1559 1689
1560 glEnable GL_TEXTURE_2D; 1690 glEnable GL_TEXTURE_2D;
1561 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1691
1692 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1693 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1562 1694
1563 if ($tex->{format} == GL_ALPHA) { 1695 if ($tex->{format} == GL_ALPHA) {
1696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1564 glColor @{$self->{fg}}; 1697 glColor @{$self->{fg}};
1565 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1698 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1566 } else { 1699 } else {
1700 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1567 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1701 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1568 } 1702 }
1569 1703
1570 glDisable GL_TEXTURE_2D; 1704 glDisable GL_TEXTURE_2D;
1571} 1705}
1572 1706
… …
1589 can_hover => 1, 1723 can_hover => 1,
1590 can_focus => 1, 1724 can_focus => 1,
1591 valign => 0, 1725 valign => 0,
1592 can_events => 1, 1726 can_events => 1,
1593 #text => ... 1727 #text => ...
1728 #hidden => "*",
1594 @_ 1729 @_
1595 ) 1730 )
1596} 1731}
1597 1732
1598sub _set_text { 1733sub _set_text {
… …
1600 1735
1601 delete $self->{cur_h}; 1736 delete $self->{cur_h};
1602 1737
1603 return if $self->{text} eq $text; 1738 return if $self->{text} eq $text;
1604 1739
1605 delete $self->{texture};
1606
1607 $self->{last_activity} = $::NOW; 1740 $self->{last_activity} = $::NOW;
1608 $self->{text} = $text; 1741 $self->{text} = $text;
1609 1742
1610 $text =~ s/./*/g if $self->{hidden}; 1743 $text =~ s/./*/g if $self->{hidden};
1611 $self->{layout}->set_text ("$text "); 1744 $self->{layout}->set_text ("$text ");
1745 delete $self->{size_req};
1612 1746
1613 $self->_emit (changed => $self->{text}); 1747 $self->_emit (changed => $self->{text});
1748
1749 $self->realloc;
1750 $self->update;
1614} 1751}
1615 1752
1616sub set_text { 1753sub set_text {
1617 my ($self, $text) = @_; 1754 my ($self, $text) = @_;
1618 1755
1619 $self->{cursor} = length $text; 1756 $self->{cursor} = length $text;
1620 $self->_set_text ($text); 1757 $self->_set_text ($text);
1621 $self->update;
1622 $self->check_size;
1623} 1758}
1624 1759
1625sub get_text { 1760sub get_text {
1626 $_[0]{text} 1761 $_[0]{text}
1627} 1762}
… …
1657 $self->{cursor} = length $text; 1792 $self->{cursor} = length $text;
1658 } elsif ($uni == 27) { 1793 } elsif ($uni == 27) {
1659 $self->_emit ('escape'); 1794 $self->_emit ('escape');
1660 } elsif ($uni) { 1795 } elsif ($uni) {
1661 substr $text, $self->{cursor}++, 0, chr $uni; 1796 substr $text, $self->{cursor}++, 0, chr $uni;
1797 } else {
1798 return 0;
1662 } 1799 }
1663 1800
1664 $self->_set_text ($text); 1801 $self->_set_text ($text);
1665 $self->update; 1802
1666 $self->check_size; 1803 $self->realloc;
1804
1805 1
1667} 1806}
1668 1807
1669sub focus_in { 1808sub focus_in {
1670 my ($self) = @_; 1809 my ($self) = @_;
1671 1810
… …
1686 utf8::encode $text; 1825 utf8::encode $text;
1687 $self->{cursor} = length substr $text, 0, $idx; 1826 $self->{cursor} = length substr $text, 0, $idx;
1688 1827
1689 $self->_set_text ($self->{text}); 1828 $self->_set_text ($self->{text});
1690 $self->update; 1829 $self->update;
1830
1831 1
1691} 1832}
1692 1833
1693sub mouse_motion { 1834sub mouse_motion {
1694 my ($self, $ev, $x, $y) = @_; 1835 my ($self, $ev, $x, $y) = @_;
1695# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1836# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1837
1838 0
1696} 1839}
1697 1840
1698sub _draw { 1841sub _draw {
1699 my ($self) = @_; 1842 my ($self) = @_;
1700 1843
1701 local $self->{fg} = $self->{fg}; 1844 local $self->{fg} = $self->{fg};
1702 1845
1703 if ($FOCUS == $self) { 1846 if ($FOCUS == $self) {
1704 glColor @{$self->{active_bg}}; 1847 glColor_premultiply @{$self->{active_bg}};
1705 $self->{fg} = $self->{active_fg}; 1848 $self->{fg} = $self->{active_fg};
1706 } else { 1849 } else {
1707 glColor @{$self->{bg}}; 1850 glColor_premultiply @{$self->{bg}};
1708 } 1851 }
1709 1852
1710 glEnable GL_BLEND; 1853 glEnable GL_BLEND;
1711 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1854 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1712 glBegin GL_QUADS; 1855 glBegin GL_QUADS;
1713 glVertex 0 , 0; 1856 glVertex 0 , 0;
1714 glVertex 0 , $self->{h}; 1857 glVertex 0 , $self->{h};
1715 glVertex $self->{w}, $self->{h}; 1858 glVertex $self->{w}, $self->{h};
1716 glVertex $self->{w}, 0; 1859 glVertex $self->{w}, 0;
… …
1777 } else { 1920 } else {
1778 $self->set_text ($self->{history_saveback}); 1921 $self->set_text ($self->{history_saveback});
1779 } 1922 }
1780 1923
1781 } else { 1924 } else {
1782 $self->SUPER::key_down ($ev); 1925 return $self->SUPER::key_down ($ev)
1926 }
1927
1783 } 1928 1
1784
1785} 1929}
1786 1930
1787############################################################################# 1931#############################################################################
1788 1932
1789package CFClient::UI::Button; 1933package CFClient::UI::Button;
… …
1798 1942
1799sub new { 1943sub new {
1800 my $class = shift; 1944 my $class = shift;
1801 1945
1802 $class->SUPER::new ( 1946 $class->SUPER::new (
1803 padding => 4, 1947 padding_x => 4,
1948 padding_y => 4,
1804 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1805 active_fg => [0, 0, 1], 1950 active_fg => [0, 0, 1],
1806 can_hover => 1, 1951 can_hover => 1,
1807 align => 0, 1952 align => 0,
1808 valign => 0, 1953 valign => 0,
… …
1817 my ($self, $ev, $x, $y) = @_; 1962 my ($self, $ev, $x, $y) = @_;
1818 1963
1819 $self->emit ("activate") 1964 $self->emit ("activate")
1820 if $x >= 0 && $x < $self->{w} 1965 if $x >= 0 && $x < $self->{w}
1821 && $y >= 0 && $y < $self->{h}; 1966 && $y >= 0 && $y < $self->{h};
1967
1968 1
1822} 1969}
1823 1970
1824sub _draw { 1971sub _draw {
1825 my ($self) = @_; 1972 my ($self) = @_;
1826 1973
1827 local $self->{fg} = $self->{fg}; 1974 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1828
1829 if ($GRAB == $self) {
1830 $self->{fg} = $self->{active_fg};
1831 }
1832 1975
1833 glEnable GL_TEXTURE_2D; 1976 glEnable GL_TEXTURE_2D;
1834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1977 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1835 glColor 0, 0, 0, 1; 1978 glColor 0, 0, 0, 1;
1836 1979
… …
1841 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1842} 1985}
1843 1986
1844############################################################################# 1987#############################################################################
1845 1988
1989package CFClient::UI::ImageButton;
1990
1991our @ISA = CFClient::UI::Image::;
1992
1993use CFClient::OpenGL;
1994
1995my %textures;
1996
1997sub new {
1998 my $class = shift;
1999
2000 my $self = $class->SUPER::new (
2001 padding_x => 4,
2002 padding_y => 4,
2003 fg => [1, 1, 1],
2004 active_fg => [0, 0, 1],
2005 can_hover => 1,
2006 align => 0,
2007 valign => 0,
2008 can_events => 1,
2009 @_
2010 );
2011}
2012
2013sub activate { }
2014
2015sub button_up {
2016 my ($self, $ev, $x, $y) = @_;
2017
2018 $self->emit ("activate")
2019 if $x >= 0 && $x < $self->{w}
2020 && $y >= 0 && $y < $self->{h};
2021
2022 1
2023}
2024
2025#############################################################################
2026
1846package CFClient::UI::CheckBox; 2027package CFClient::UI::CheckBox;
1847 2028
1848our @ISA = CFClient::UI::DrawBG::; 2029our @ISA = CFClient::UI::DrawBG::;
1849 2030
1850my @tex = 2031my @tex =
… …
1855 2036
1856sub new { 2037sub new {
1857 my $class = shift; 2038 my $class = shift;
1858 2039
1859 $class->SUPER::new ( 2040 $class->SUPER::new (
1860 padding => 2, 2041 padding_x => 2,
2042 padding_y => 2,
1861 fg => [1, 1, 1], 2043 fg => [1, 1, 1],
1862 active_fg => [1, 1, 0], 2044 active_fg => [1, 1, 0],
1863 bg => [0, 0, 0, 0.2], 2045 bg => [0, 0, 0, 0.2],
1864 active_bg => [1, 1, 1, 0.5], 2046 active_bg => [1, 1, 1, 0.5],
1865 state => 0, 2047 state => 0,
… …
1869} 2051}
1870 2052
1871sub size_request { 2053sub size_request {
1872 my ($self) = @_; 2054 my ($self) = @_;
1873 2055
1874 ($self->{padding} * 2 + 6) x 2 2056 (6) x 2
1875} 2057}
1876 2058
1877sub button_down { 2059sub button_down {
1878 my ($self, $ev, $x, $y) = @_; 2060 my ($self, $ev, $x, $y) = @_;
1879 2061
1880 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2062 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1881 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2063 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1882 $self->{state} = !$self->{state}; 2064 $self->{state} = !$self->{state};
1883 $self->_emit (changed => $self->{state}); 2065 $self->_emit (changed => $self->{state});
2066 } else {
2067 return 0
2068 }
2069
1884 } 2070 1
1885} 2071}
1886 2072
1887sub _draw { 2073sub _draw {
1888 my ($self) = @_; 2074 my ($self) = @_;
1889 2075
1890 $self->SUPER::_draw; 2076 $self->SUPER::_draw;
1891 2077
1892 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2078 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1893 2079
1894 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2080 my ($w, $h) = @$self{qw(w h)};
2081
2082 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1895 2083
1896 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2084 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1897 2085
1898 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2086 my $tex = $self->{state} ? $tex[1] : $tex[0];
1899 2087
… …
2054 2242
2055 my $h1 = $self->{h} * (1 - $ycut1); 2243 my $h1 = $self->{h} * (1 - $ycut1);
2056 my $h2 = $self->{h} * (1 - $ycut2); 2244 my $h2 = $self->{h} * (1 - $ycut2);
2057 2245
2058 glEnable GL_BLEND; 2246 glEnable GL_BLEND;
2059 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2247 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2248 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060 glEnable GL_TEXTURE_2D; 2249 glEnable GL_TEXTURE_2D;
2061 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2250 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2062 2251
2063 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2252 glBindTexture GL_TEXTURE_2D, $t1->{name};
2064 glBegin GL_QUADS; 2253 glBegin GL_QUADS;
… …
2164 fg => [1, 1, 1], 2353 fg => [1, 1, 1],
2165 active_fg => [0, 0, 0], 2354 active_fg => [0, 0, 0],
2166 bg => [0, 0, 0, 0.2], 2355 bg => [0, 0, 0, 0.2],
2167 active_bg => [1, 1, 1, 0.5], 2356 active_bg => [1, 1, 1, 0.5],
2168 range => [0, 0, 100, 10, 0], 2357 range => [0, 0, 100, 10, 0],
2169 req_w => $::WIDTH / 80, 2358 min_w => $::WIDTH / 80,
2170 req_h => $::WIDTH / 80, 2359 min_h => $::WIDTH / 80,
2171 vertical => 0, 2360 vertical => 0,
2172 can_hover => 1, 2361 can_hover => 1,
2173 inner_pad => 0.02, 2362 inner_pad => 0.02,
2174 @_ 2363 @_
2175 ); 2364 );
… …
2178 $self->update; 2367 $self->update;
2179 2368
2180 $self 2369 $self
2181} 2370}
2182 2371
2372sub changed { }
2373
2183sub set_range { 2374sub set_range {
2184 my ($self, $range) = @_; 2375 my ($self, $range) = @_;
2185 2376
2186 ($range, $self->{range}) = ($self->{range}, $range); 2377 ($range, $self->{range}) = ($self->{range}, $range);
2187 2378
2188 $self->update
2189 if "@$range" ne "@{$self->{range}}"; 2379 if ("@$range" ne "@{$self->{range}}") {
2380 $self->update;
2381 $self->set_value ($self->{range}[0]);
2382 }
2190} 2383}
2191 2384
2192sub set_value { 2385sub set_value {
2193 my ($self, $value) = @_; 2386 my ($self, $value) = @_;
2194 2387
… …
2213} 2406}
2214 2407
2215sub size_request { 2408sub size_request {
2216 my ($self) = @_; 2409 my ($self) = @_;
2217 2410
2218 my $w = $self->{req_w}; 2411 ($self->{req_w}, $self->{req_h})
2219 my $h = $self->{req_h};
2220
2221 $self->{vertical} ? ($h, $w) : ($w, $h)
2222} 2412}
2223 2413
2224sub button_down { 2414sub button_down {
2225 my ($self, $ev, $x, $y) = @_; 2415 my ($self, $ev, $x, $y) = @_;
2226 2416
2227 $self->SUPER::button_down ($ev, $x, $y); 2417 $self->SUPER::button_down ($ev, $x, $y);
2228 2418
2229 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2419 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2230 2420
2231 $self->mouse_motion ($ev, $x, $y); 2421 $self->mouse_motion ($ev, $x, $y)
2232} 2422}
2233 2423
2234sub mouse_motion { 2424sub mouse_motion {
2235 my ($self, $ev, $x, $y) = @_; 2425 my ($self, $ev, $x, $y) = @_;
2236 2426
… …
2240 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2430 my (undef, $lo, $hi, $page) = @{$self->{range}};
2241 2431
2242 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2432 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2243 2433
2244 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2434 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2435 } else {
2436 return 0;
2437 }
2438
2245 } 2439 1
2246} 2440}
2247 2441
2248sub update { 2442sub update {
2249 my ($self) = @_; 2443 my ($self) = @_;
2250 2444
2251 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2445 delete $self->{knob_w};
2446 $self->SUPER::update;
2447}
2448
2449sub _draw {
2450 my ($self) = @_;
2451
2452 unless ($self->{knob_w}) {
2252 $self->set_value ($self->{range}[0]); 2453 $self->set_value ($self->{range}[0]);
2253 2454
2254 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2455 my ($value, $lo, $hi, $page) = @{$self->{range}};
2255 my $range = ($hi - $page - $lo) || 1e-100; 2456 my $range = ($hi - $page - $lo) || 1e-100;
2256 2457
… …
2262 $value = ($value - $lo) / $range; 2463 $value = ($value - $lo) / $range;
2263 $value = $value * $self->{scale} + $self->{offset}; 2464 $value = $value * $self->{scale} + $self->{offset};
2264 2465
2265 $self->{knob_x} = $value - $knob_w * 0.5; 2466 $self->{knob_x} = $value - $knob_w * 0.5;
2266 $self->{knob_w} = $knob_w; 2467 $self->{knob_w} = $knob_w;
2267 }); 2468 }
2268
2269 $self->SUPER::update;
2270}
2271
2272sub _draw {
2273 my ($self) = @_;
2274 2469
2275 $self->SUPER::_draw (); 2470 $self->SUPER::_draw ();
2276 2471
2277 glScale $self->{w}, $self->{h}; 2472 glScale $self->{w}, $self->{h};
2278 2473
… …
2339sub set_range { shift->{slider}->set_range (@_) } 2534sub set_range { shift->{slider}->set_range (@_) }
2340sub set_value { shift->{slider}->set_value (@_) } 2535sub set_value { shift->{slider}->set_value (@_) }
2341 2536
2342############################################################################# 2537#############################################################################
2343 2538
2344package CFClient::UI::TextView; 2539package CFClient::UI::TextScroller;
2345 2540
2346our @ISA = CFClient::UI::HBox::; 2541our @ISA = CFClient::UI::HBox::;
2347 2542
2348use CFClient::OpenGL; 2543use CFClient::OpenGL;
2349 2544
… …
2351 my $class = shift; 2546 my $class = shift;
2352 2547
2353 my $self = $class->SUPER::new ( 2548 my $self = $class->SUPER::new (
2354 fontsize => 1, 2549 fontsize => 1,
2355 can_events => 0, 2550 can_events => 0,
2551 indent => 0,
2356 #font => default_font 2552 #font => default_font
2357 @_, 2553 @_,
2358 2554
2359 layout => (new CFClient::Layout 1), 2555 layout => (new CFClient::Layout 1),
2360 par => [], 2556 par => [],
… …
2383 $self->SUPER::size_allocate ($w, $h); 2579 $self->SUPER::size_allocate ($w, $h);
2384 2580
2385 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2581 $self->{layout}->set_font ($self->{font}) if $self->{font};
2386 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2582 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2387 $self->{layout}->set_width ($self->{children}[0]{w}); 2583 $self->{layout}->set_width ($self->{children}[0]{w});
2584 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2388 2585
2389 $self->reflow; 2586 $self->reflow;
2390} 2587}
2391 2588
2392sub text_size { 2589sub text_size {
… …
2394 2591
2395 my $layout = $self->{layout}; 2592 my $layout = $self->{layout};
2396 2593
2397 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2594 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2398 $layout->set_width ($self->{children}[0]{w} - $indent); 2595 $layout->set_width ($self->{children}[0]{w} - $indent);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2399 $layout->set_markup ($text); 2597 $layout->set_markup ($text);
2400 2598
2401 $layout->size 2599 $layout->size
2402} 2600}
2403 2601
… …
2442 2640
2443 return unless $self->{h} > 0; 2641 return unless $self->{h} > 0;
2444 2642
2445 delete $self->{texture}; 2643 delete $self->{texture};
2446 2644
2447 $ROOT->on_post_alloc ($self, sub { 2645 $ROOT->on_post_alloc ($self => sub {
2448 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2646 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2449 2647
2450 if (delete $self->{need_reflow}) { 2648 if (delete $self->{need_reflow}) {
2451 my $height = 0; 2649 my $height = 0;
2452 2650
… …
2455 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2653 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2456 2654
2457 for (@{$self->{par}}) { 2655 for (@{$self->{par}}) {
2458 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2656 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2459 $layout->set_width ($W - $_->[3]); 2657 $layout->set_width ($W - $_->[3]);
2658 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2460 $layout->set_markup ($_->[4]); 2659 $layout->set_markup ($_->[4]);
2461 my ($w, $h) = $layout->size; 2660 my ($w, $h) = $layout->size;
2462 $_->[0] = $w + $_->[3]; 2661 $_->[0] = $w + $_->[3];
2463 $_->[1] = $h; 2662 $_->[1] = $h;
2464 } 2663 }
… …
2467 } 2666 }
2468 2667
2469 $self->{height} = $height; 2668 $self->{height} = $height;
2470 2669
2471 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2670 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2472 2671
2473 delete $self->{texture}; 2672 delete $self->{texture};
2474 } 2673 }
2475 2674
2476 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2675 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2477 glClearColor 0.5, 0.5, 0.5, 0; 2676 glClearColor 0, 0, 0, 0;
2478 glClear GL_COLOR_BUFFER_BIT; 2677 glClear GL_COLOR_BUFFER_BIT;
2479 2678
2480 my $top = int $self->{children}[1]{range}[0]; 2679 my $top = int $self->{children}[1]{range}[0];
2481 2680
2482 my $y0 = $top; 2681 my $y0 = $top;
… …
2496 my $h = $par->[1]; 2695 my $h = $par->[1];
2497 2696
2498 if ($y0 < $y + $h && $y < $y1) { 2697 if ($y0 < $y + $h && $y < $y1) {
2499 $layout->set_foreground (@{ $par->[2] }); 2698 $layout->set_foreground (@{ $par->[2] });
2500 $layout->set_width ($W - $par->[3]); 2699 $layout->set_width ($W - $par->[3]);
2700 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2501 $layout->set_markup ($par->[4]); 2701 $layout->set_markup ($par->[4]);
2502 2702
2503 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2703 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2504 2704
2505 glRasterPos $par->[3], $y - $y0; 2705 glRasterPos $par->[3], $y - $y0;
… …
2517sub _draw { 2717sub _draw {
2518 my ($self) = @_; 2718 my ($self) = @_;
2519 2719
2520 glEnable GL_TEXTURE_2D; 2720 glEnable GL_TEXTURE_2D;
2521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2721 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2522 glColor 1, 1, 1, 1; 2722 glColor 0, 0, 0, 1;
2523 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2723 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2524 glDisable GL_TEXTURE_2D; 2724 glDisable GL_TEXTURE_2D;
2525 2725
2526 $self->{children}[1]->draw; 2726 $self->{children}[1]->draw;
2527 2727
2528} 2728}
… …
2611} 2811}
2612 2812
2613sub set_tooltip_from { 2813sub set_tooltip_from {
2614 my ($self, $widget) = @_; 2814 my ($self, $widget) = @_;
2615 2815
2816 my $tooltip = $widget->{tooltip};
2817
2818 if ($ENV{CFPLUS_DEBUG} & 2) {
2819 $tooltip .= "\n\n" . (ref $widget) . "\n"
2820 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2821 . "req $widget->{req_w} $widget->{req_h}\n"
2822 . "visible $widget->{visible}";
2823 }
2824
2825 $tooltip =~ s/^\n+//;
2826 $tooltip =~ s/\n+$//;
2827
2616 $self->add (new CFClient::UI::Label 2828 $self->add (new CFClient::UI::Label
2617 markup => $widget->{tooltip}, 2829 markup => $tooltip,
2618 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2830 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2619 fontsize => 0.8, 2831 fontsize => 0.8,
2620 fg => [0, 0, 0, 1], 2832 fg => [0, 0, 0, 1],
2621 ellipsise => 0, 2833 ellipsise => 0,
2622 font => ($widget->{tooltip_font} || $::FONT_PROP), 2834 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2633 2845
2634sub size_allocate { 2846sub size_allocate {
2635 my ($self, $w, $h) = @_; 2847 my ($self, $w, $h) = @_;
2636 2848
2637 $self->SUPER::size_allocate ($w - 4, $h - 4); 2849 $self->SUPER::size_allocate ($w - 4, $h - 4);
2850}
2851
2852sub visibility_change {
2853 my ($self, $visible) = @_;
2854
2855 return unless $visible;
2856
2857 $self->{root}->on_post_alloc ("move_$self" => sub {
2858 my $widget = $self->{owner}
2859 or return;
2860
2861 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2862
2863 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2864 if $x + $self->{w} > $self->{root}{w};
2865
2866 $self->move_abs ($x, $y);
2867 });
2638} 2868}
2639 2869
2640sub _draw { 2870sub _draw {
2641 my ($self) = @_; 2871 my ($self) = @_;
2642 2872
… …
2659 glVertex $w, $h; 2889 glVertex $w, $h;
2660 glVertex $w, 0; 2890 glVertex $w, 0;
2661 glEnd; 2891 glEnd;
2662 2892
2663 glTranslate 2 - 0.375, 2 - 0.375; 2893 glTranslate 2 - 0.375, 2 - 0.375;
2894
2664 $self->SUPER::_draw; 2895 $self->SUPER::_draw;
2665} 2896}
2666 2897
2667############################################################################# 2898#############################################################################
2668 2899
… …
2727 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2958 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2728 2959
2729 if ($tex) { 2960 if ($tex) {
2730 glEnable GL_TEXTURE_2D; 2961 glEnable GL_TEXTURE_2D;
2731 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2962 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2732 glColor 1, 1, 1, 1; 2963 glColor 0, 0, 0, 1;
2733 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2964 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2734 glDisable GL_TEXTURE_2D; 2965 glDisable GL_TEXTURE_2D;
2735 } 2966 }
2736} 2967}
2737 2968
2738sub DESTROY { 2969sub destroy {
2739 my ($self) = @_; 2970 my ($self) = @_;
2740 2971
2741 $self->{timer}->cancel 2972 $self->{timer}->cancel
2742 if $self->{timer}; 2973 if $self->{timer};
2743 2974
2744 $self->SUPER::DESTROY; 2975 $self->SUPER::destroy;
2745} 2976}
2746 2977
2747############################################################################# 2978#############################################################################
2748 2979
2749package CFClient::UI::Inventory; 2980package CFClient::UI::Buttonbar;
2750 2981
2751our @ISA = CFClient::UI::ScrolledWindow::; 2982our @ISA = CFClient::UI::HBox::;
2752 2983
2753sub new { 2984# TODO: should actualyl wrap buttons and other goodies.
2754 my $class = shift;
2755
2756 my $self = $class->SUPER::new (
2757 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2758 @_,
2759 );
2760
2761 $self
2762}
2763
2764sub set_items {
2765 my ($self, $items) = @_;
2766
2767 $self->{scrolled}->clear;
2768 return unless $items;
2769
2770 my @items = sort {
2771 ($a->{type} <=> $b->{type})
2772 or ($a->{name} cmp $b->{name})
2773 } @$items;
2774
2775 $self->{real_items} = \@items;
2776
2777 my $row = 0;
2778 for my $item (@items) {
2779 CFClient::Item::update_widgets $item;
2780
2781 $self->{scrolled}->add (0, $row, $item->{face_widget});
2782 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2783 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2784
2785 $row++;
2786 }
2787}
2788 2985
2789############################################################################# 2986#############################################################################
2790 2987
2791package CFClient::UI::Menu; 2988package CFClient::UI::Menu;
2792 2989
… …
2804 ); 3001 );
2805 3002
2806 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3003 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2807 3004
2808 for my $item (@{ $self->{items} }) { 3005 for my $item (@{ $self->{items} }) {
2809 my ($widget, $cb) = @$item; 3006 my ($widget, $cb, $tooltip) = @$item;
2810 3007
2811 # handle various types of items, only text for now 3008 # handle various types of items, only text for now
2812 if (!ref $widget) { 3009 if (!ref $widget) {
2813 $widget = new CFClient::UI::Label 3010 $widget = new CFClient::UI::Label
2814 can_hover => 1, 3011 can_hover => 1,
2815 can_events => 1, 3012 can_events => 1,
2816 text => $widget; 3013 markup => $widget,
3014 tooltip => $tooltip
2817 } 3015 }
2818 3016
2819 $self->{item}{$widget} = $item; 3017 $self->{item}{$widget} = $item;
2820 3018
2821 $self->{vbox}->add ($widget); 3019 $self->{vbox}->add ($widget);
… …
2833 # maybe save $GRAB? must be careful about events... 3031 # maybe save $GRAB? must be careful about events...
2834 $GRAB = $self; 3032 $GRAB = $self;
2835 $self->{button} = $ev->{button}; 3033 $self->{button} = $ev->{button};
2836 3034
2837 $self->show; 3035 $self->show;
2838 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3036 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2839} 3037}
2840 3038
2841sub mouse_motion { 3039sub mouse_motion {
2842 my ($self, $ev, $x, $y) = @_; 3040 my ($self, $ev, $x, $y) = @_;
2843 3041
2844 # TODO: should use vbox->find_widget or so 3042 # TODO: should use vbox->find_widget or so
2845 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3043 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2846 $self->{hover} = $self->{item}{$HOVER}; 3044 $self->{hover} = $self->{item}{$HOVER};
3045
3046 0
2847} 3047}
2848 3048
2849sub button_up { 3049sub button_up {
2850 my ($self, $ev, $x, $y) = @_; 3050 my ($self, $ev, $x, $y) = @_;
2851 3051
… …
2853 undef $GRAB; 3053 undef $GRAB;
2854 $self->hide; 3054 $self->hide;
2855 3055
2856 $self->_emit ("popdown"); 3056 $self->_emit ("popdown");
2857 $self->{hover}[1]->() if $self->{hover}; 3057 $self->{hover}[1]->() if $self->{hover};
3058 } else {
3059 return 0
3060 }
3061
2858 } 3062 1
2859} 3063}
2860 3064
2861############################################################################# 3065#############################################################################
2862 3066
2863package CFClient::UI::Statusbox; 3067package CFClient::UI::Multiplexer;
2864 3068
2865our @ISA = CFClient::UI::VBox::; 3069our @ISA = CFClient::UI::Container::;
2866 3070
2867sub new { 3071sub new {
2868 my $class = shift; 3072 my $class = shift;
2869 3073
2870 $class->SUPER::new ( 3074 my $self = $class->SUPER::new (
3075 @_,
3076 );
3077
3078 $self->{current} = $self->{children}[0]
3079 if @{ $self->{children} };
3080
3081 $self
3082}
3083
3084sub add {
3085 my ($self, @widgets) = @_;
3086
3087 $self->SUPER::add (@widgets);
3088
3089 $self->{current} = $self->{children}[0]
3090 if @{ $self->{children} };
3091}
3092
3093sub set_current_page {
3094 my ($self, $page_or_widget) = @_;
3095
3096 my $widget = ref $page_or_widget
3097 ? $page_or_widget
3098 : $self->{children}[$page_or_widget];
3099
3100 $self->{current} = $widget;
3101 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3102
3103 $self->_emit (page_changed => $self->{current});
3104
3105 $self->realloc;
3106}
3107
3108sub visible_children {
3109 $_[0]{current}
3110}
3111
3112sub size_request {
3113 my ($self) = @_;
3114
3115 $self->{current}->size_request
3116}
3117
3118sub size_allocate {
3119 my ($self, $w, $h) = @_;
3120
3121 $self->{current}->configure (0, 0, $w, $h);
3122}
3123
3124sub _draw {
3125 my ($self) = @_;
3126
3127 $self->{current}->draw;
3128}
3129
3130#############################################################################
3131
3132package CFClient::UI::Notebook;
3133
3134our @ISA = CFClient::UI::VBox::;
3135
3136sub new {
3137 my $class = shift;
3138
3139 my $self = $class->SUPER::new (
3140 buttonbar => (new CFClient::UI::Buttonbar),
3141 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3142 # filter => # will be put between multiplexer and $self
3143 @_,
3144 );
3145
3146 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3147 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3148
3149 $self
3150}
3151
3152sub add {
3153 my ($self, $title, $widget, $tooltip) = @_;
3154
3155 Scalar::Util::weaken $self;
3156
3157 $self->{buttonbar}->add (new CFClient::UI::Button
3158 markup => $title,
3159 tooltip => $tooltip,
3160 on_activate => sub { $self->set_current_page ($widget) },
3161 );
3162
3163 $self->{multiplexer}->add ($widget);
3164}
3165
3166sub set_current_page {
3167 my ($self, $page) = @_;
3168
3169 $self->{multiplexer}->set_current_page ($page);
3170 $self->_emit (page_changed => $self->{multiplexer}{current});
3171}
3172
3173#############################################################################
3174
3175package CFClient::UI::Combobox;
3176
3177use utf8;
3178
3179our @ISA = CFClient::UI::Button::;
3180
3181sub new {
3182 my $class = shift;
3183
3184 my $self = $class->SUPER::new (
3185 options => [], # [value, title, longdesc], ...
3186 value => undef,
3187 @_,
3188 );
3189
3190 $self->_set_value ($self->{value});
3191
3192 $self
3193}
3194
3195sub button_down {
3196 my ($self, $ev) = @_;
3197
3198 my @menu_items;
3199
3200 for (@{ $self->{options} }) {
3201 my ($value, $title, $tooltip) = @$_;
3202
3203 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3204 }
3205
3206 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3207}
3208
3209sub _set_value {
3210 my ($self, $value) = @_;
3211
3212 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3213 or return;
3214
3215 $self->{value} = $item->[0];
3216 $self->set_markup ("$item->[1] ⇓");
3217 $self->set_tooltip ($item->[2]);
3218}
3219
3220sub set_value {
3221 my ($self, $value) = @_;
3222
3223 return unless $self->{value} ne $value;
3224
3225 $self->_set_value ($value);
3226 $self->_emit (changed => $value);
3227}
3228
3229#############################################################################
3230
3231package CFClient::UI::Statusbox;
3232
3233our @ISA = CFClient::UI::VBox::;
3234
3235sub new {
3236 my $class = shift;
3237
3238 my $self = $class->SUPER::new (
2871 fontsize => 0.8, 3239 fontsize => 0.8,
2872 @_, 3240 @_,
2873 ) 3241 );
3242
3243 Scalar::Util::weaken (my $this = $self);
3244
3245 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3246
3247 $self
2874} 3248}
2875 3249
2876sub reorder { 3250sub reorder {
2877 my ($self) = @_; 3251 my ($self) = @_;
2878 my $NOW = time; 3252 my $NOW = Time::HiRes::time;
3253
3254 # freeze display when hovering over any label
3255 return if $CFClient::UI::TOOLTIP->{owner}
3256 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3257 values %{ $self->{item} };
2879 3258
2880 while (my ($k, $v) = each %{ $self->{item} }) { 3259 while (my ($k, $v) = each %{ $self->{item} }) {
2881 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3260 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2882 } 3261 }
2883 3262
… …
2886 my @items = sort { 3265 my @items = sort {
2887 $a->{pri} <=> $b->{pri} 3266 $a->{pri} <=> $b->{pri}
2888 or $b->{id} <=> $a->{id} 3267 or $b->{id} <=> $a->{id}
2889 } values %{ $self->{item} }; 3268 } values %{ $self->{item} };
2890 3269
3270 $self->{timer}->interval (1);
3271
2891 my $count = 10 + 1; 3272 my $count = 10 + 1;
2892 for my $item (@items) { 3273 for my $item (@items) {
2893 last unless --$count; 3274 last unless --$count;
2894 3275
2895 push @widgets, $item->{label} ||= do { 3276 my $label = $item->{label} ||= do {
2896 # TODO: doesn't handle markup well (read as: at all) 3277 # TODO: doesn't handle markup well (read as: at all)
2897 my $short = $item->{count} > 1 3278 my $short = $item->{count} > 1
2898 ? "<b>$item->{count} ×</b> $item->{text}" 3279 ? "<b>$item->{count} ×</b> $item->{text}"
2899 : $item->{text}; 3280 : $item->{text};
2900 3281
… …
2908 tooltip => $item->{tooltip}, 3289 tooltip => $item->{tooltip},
2909 tooltip_font => $::FONT_PROP, 3290 tooltip_font => $::FONT_PROP,
2910 tooltip_width => 0.67, 3291 tooltip_width => 0.67,
2911 fontsize => $item->{fontsize} || $self->{fontsize}, 3292 fontsize => $item->{fontsize} || $self->{fontsize},
2912 max_w => $::WIDTH * 0.44, 3293 max_w => $::WIDTH * 0.44,
2913 fg => $item->{fg}, 3294 fg => [@{ $item->{fg} }],
2914 can_events => 1, 3295 can_events => 1,
2915 can_hover => 1 3296 can_hover => 1
2916 }; 3297 };
3298
3299 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3300 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3301 $label->update;
3302 $label->set_max_size (undef, $label->{req_h} * $diff)
3303 if $diff < 1;
3304 $self->{timer}->interval (1/30);
3305 } else {
3306 $label->{fg}[3] = $item->{fg}[3] || 1;
3307 }
3308
3309 push @widgets, $label;
2917 } 3310 }
2918 3311
2919 $self->clear; 3312 $self->clear;
2920 $self->SUPER::add (reverse @widgets); 3313 $self->SUPER::add (reverse @widgets);
2921} 3314}
… …
2926 $text =~ s/^\s+//; 3319 $text =~ s/^\s+//;
2927 $text =~ s/\s+$//; 3320 $text =~ s/\s+$//;
2928 3321
2929 return unless $text; 3322 return unless $text;
2930 3323
2931 my $timeout = time + ((delete $arg{timeout}) || 60); 3324 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2932 3325
2933 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3326 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2934 3327
2935 if (my $item = $self->{item}{$group}) { 3328 if (my $item = $self->{item}{$group}) {
2936 if ($item->{text} eq $text) { 3329 if ($item->{text} eq $text) {
2937 $item->{count}++; 3330 $item->{count}++;
2938 } else { 3331 } else {
2939 $item->{count} = 1; 3332 $item->{count} = 1;
2940 $item->{text} = $item->{tooltip} = $text; 3333 $item->{text} = $item->{tooltip} = $text;
2941 } 3334 }
2942 $item->{id} = ++$self->{id}; 3335 $item->{id} += 0.2;#d#
2943 $item->{timeout} = $timeout; 3336 $item->{timeout} = $timeout;
2944 delete $item->{label}; 3337 delete $item->{label};
2945 } else { 3338 } else {
2946 $self->{item}{$group} = { 3339 $self->{item}{$group} = {
2947 id => ++$self->{id}, 3340 id => ++$self->{id},
… …
2966 3359
2967 $self->reorder; 3360 $self->reorder;
2968 $self->SUPER::reconfigure; 3361 $self->SUPER::reconfigure;
2969} 3362}
2970 3363
3364sub destroy {
3365 my ($self) = @_;
3366
3367 $self->{timer}->cancel;
3368
3369 $self->SUPER::destroy;
3370}
3371
2971############################################################################# 3372#############################################################################
2972 3373
2973package CFClient::UI::Root; 3374package CFClient::UI::Inventory;
2974 3375
2975our @ISA = CFClient::UI::Container::; 3376our @ISA = CFClient::UI::ScrolledWindow::;
2976
2977use CFClient::OpenGL;
2978 3377
2979sub new { 3378sub new {
2980 my $class = shift; 3379 my $class = shift;
2981 3380
2982 $class->SUPER::new ( 3381 my $self = $class->SUPER::new (
3382 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3383 @_,
3384 );
3385
3386 $self
3387}
3388
3389sub set_items {
3390 my ($self, $items) = @_;
3391
3392 $self->{child}->clear;
3393 return unless $items;
3394
3395 my @items = sort {
3396 ($a->{type} <=> $b->{type})
3397 or ($a->{name} cmp $b->{name})
3398 } @$items;
3399
3400 $self->{real_items} = \@items;
3401
3402 my $row = 0;
3403 for my $item (@items) {
3404 CFClient::Item::update_widgets $item;
3405
3406 $self->{child}->add (0, $row, $item->{face_widget});
3407 $self->{child}->add (1, $row, $item->{desc_widget});
3408 $self->{child}->add (2, $row, $item->{weight_widget});
3409
3410 $row++;
3411 }
3412}
3413
3414#############################################################################
3415
3416package CFClient::UI::BindEditor;
3417
3418our @ISA = CFClient::UI::FancyFrame::;
3419
3420sub new {
3421 my $class = shift;
3422
3423 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3424
3425 $self->add (my $vb = new CFClient::UI::VBox);
3426
3427
3428 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3429 text => "start recording",
3430 tooltip => "Start/Stops recording of actions."
3431 ."All subsequent actions after the recording started will be captured."
3432 ."The actions are displayed after the record was stopped."
3433 ."To bind the action you have to click on the 'Bind' button",
3434 on_activate => sub {
3435 unless ($self->{recording}) {
3436 $self->start;
3437 } else {
3438 $self->stop;
3439 }
3440 });
3441
3442 $vb->add (new CFClient::UI::Label text => "Actions:");
3443 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3444
3445 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3446 $vb->add (my $hb = new CFClient::UI::HBox);
3447 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3448 $hb->add (new CFClient::UI::Button
3449 text => "bind",
3450 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3451 on_activate => sub {
3452 $self->ask_for_bind;
3453 });
3454
3455 $vb->add (my $hb = new CFClient::UI::HBox);
3456 $hb->add (new CFClient::UI::Button
3457 text => "ok",
3458 expand => 1,
3459 tooltip => "This closes the binding editor and saves the binding",
3460 on_activate => sub {
3461 $self->hide;
3462 $self->commit;
3463 });
3464
3465 $hb->add (new CFClient::UI::Button
3466 text => "cancel",
3467 expand => 1,
3468 tooltip => "This closes the binding editor without saving",
3469 on_activate => sub {
3470 $self->hide;
3471 $self->{binding_cancel}->()
3472 if $self->{binding_cancel};
3473 });
3474
3475 $self->update_binding_widgets;
3476
3477 $self
3478}
3479
3480sub commit {
3481 my ($self) = @_;
3482 my ($mod, $sym, $cmds) = $self->get_binding;
3483 if ($sym != 0 && @$cmds > 0) {
3484 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3485 ."'. Don't forget 'Save Config'!");
3486 $self->{binding_change}->($mod, $sym, $cmds)
3487 if $self->{binding_change};
3488 } else {
3489 $::STATUSBOX->add ("No action bound, no key or action specified!");
3490 $self->{binding_cancel}->()
3491 if $self->{binding_cancel};
3492 }
3493}
3494
3495sub start {
3496 my ($self) = @_;
3497
3498 $self->{rec_btn}->set_text ("stop recording");
3499 $self->{recording} = 1;
3500 $self->clear_command_list;
3501 $::CONN->start_record if $::CONN;
3502}
3503
3504sub stop {
3505 my ($self) = @_;
3506
3507 $self->{rec_btn}->set_text ("start recording");
3508 $self->{recording} = 0;
3509
3510 my $rec;
3511 $rec = $::CONN->stop_record if $::CONN;
3512 return unless ref $rec eq 'ARRAY';
3513 $self->set_command_list ($rec);
3514}
3515
3516
3517sub ask_for_bind_and_commit {
3518 my ($self) = @_;
3519 $self->ask_for_bind (1);
3520}
3521
3522sub ask_for_bind {
3523 my ($self, $commit, $end_cb) = @_;
3524
3525 CFClient::Binder::open_binding_dialog (sub {
3526 my ($mod, $sym) = @_;
3527 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3528 $self->update_binding_widgets;
3529 $self->commit if $commit;
3530 $end_cb->() if $end_cb;
3531 });
3532}
3533
3534# $mod and $sym are the modifiers and key symbol
3535# $cmds is a array ref of strings (the commands)
3536# $cb is the callback that is executed on OK
3537# $ccb is the callback that is executed on CANCEL and
3538# when the binding was unsuccessful on OK
3539sub set_binding {
3540 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3541
3542 $self->clear_command_list;
3543 $self->{recording} = 0;
3544 $self->{rec_btn}->set_text ("start recording");
3545
3546 $self->{binding} = [$mod, $sym];
3547 $self->{commands} = $cmds;
3548
3549 $self->{binding_change} = $cb;
3550 $self->{binding_cancel} = $ccb;
3551
3552 $self->update_binding_widgets;
3553}
3554
3555# this is a shortcut method that asks for a binding
3556# and then just binds it.
3557sub do_quick_binding {
3558 my ($self, $cmds, $end_cb) = @_;
3559 $self->set_binding (undef, undef, $cmds, sub {
3560 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3561 });
3562 $self->ask_for_bind (1, $end_cb);
3563}
3564
3565sub update_binding_widgets {
3566 my ($self) = @_;
3567 my ($mod, $sym, $cmds) = $self->get_binding;
3568 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3569 $self->set_command_list ($cmds);
3570}
3571
3572sub get_binding {
3573 my ($self) = @_;
3574 return (
3575 $self->{binding}->[0],
3576 $self->{binding}->[1],
3577 [ grep { defined $_ } @{$self->{commands}} ]
3578 );
3579}
3580
3581sub clear_command_list {
3582 my ($self) = @_;
3583 $self->{cmdbox}->clear ();
3584}
3585
3586sub set_command_list {
3587 my ($self, $cmds) = @_;
3588
3589 $self->{cmdbox}->clear ();
3590 $self->{commands} = $cmds;
3591
3592 my $idx = 0;
3593
3594 for (@$cmds) {
3595 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3596
3597 my $i = $idx;
3598 $hb->add (new CFClient::UI::Label text => $_);
3599 $hb->add (new CFClient::UI::Button
3600 text => "delete",
3601 tooltip => "Deletes the action from the record",
3602 on_activate => sub {
3603 $self->{cmdbox}->remove ($hb);
3604 $cmds->[$i] = undef;
3605 });
3606
3607
3608 $idx++
3609 }
3610}
3611
3612#############################################################################
3613
3614package CFClient::UI::SpellList;
3615
3616our @ISA = CFClient::UI::Table::;
3617
3618sub new {
3619 my $class = shift;
3620
3621 my $self = $class->SUPER::new (
3622 binding => [],
3623 commands => [],
3624 @_,
3625 )
3626}
3627
3628my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3629
3630my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3631 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3632my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3633 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3634my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3635 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3636my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3637 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3638my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3639 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3640
3641sub rebuild_spell_list {
3642 my ($self) = @_;
3643
3644 $CFClient::UI::ROOT->on_refresh ($self => sub {
3645 $self->clear;
3646
3647 return unless $::CONN;
3648
3649 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3650 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3651 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3652 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3653 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3654
3655 my $row = 0;
3656
3657 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3658 my $spell = $self->{spell}{$_};
3659
3660 $row++;
3661
3662 my $spell_cb = sub {
3663 my ($widget, $ev) = @_;
3664
3665 if ($ev->{button} == 1) {
3666 $::CONN->user_send ("cast $spell->{name}");
3667 } elsif ($ev->{button} == 2) {
3668 $::CONN->user_send ("invoke $spell->{name}");
3669 } elsif ($ev->{button} == 3) {
3670 (new CFClient::UI::Menu
3671 items => [
3672 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3673 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3674 ],
3675 )->popup ($ev);
3676 } else {
3677 return 0;
3678 }
3679
3680 1
3681 };
3682
3683 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3684
3685 #TODO: add path info to tooltip
3686 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3687
3688 $self->add (0, $row, new CFClient::UI::Face
3689 face => $spell->{face},
3690 can_hover => 1,
3691 can_events => 1,
3692 tooltip => $tooltip,
3693 on_button_down => $spell_cb,
3694 );
3695
3696 $self->add (1, $row, new CFClient::UI::Label
3697 expand => 1,
3698 text => $spell->{name},
3699 can_hover => 1,
3700 can_events => 1,
3701 tooltip => $tooltip,
3702 on_button_down => $spell_cb,
3703 );
3704
3705 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3706 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3707 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3708 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3709 }
3710 });
3711}
3712
3713sub add_spell {
3714 my ($self, $spell) = @_;
3715
3716 $self->{spell}->{$spell->{name}} = $spell;
3717 $self->rebuild_spell_list;
3718}
3719
3720sub remove_spell {
3721 my ($self, $spell) = @_;
3722
3723 delete $self->{spell}->{$spell->{name}};
3724 $self->rebuild_spell_list;
3725}
3726
3727sub clear_spells {
3728 my ($self) = @_;
3729
3730 $self->{spell} = {};
3731 $self->rebuild_spell_list;
3732}
3733
3734#############################################################################
3735
3736package CFClient::UI::Root;
3737
3738our @ISA = CFClient::UI::Container::;
3739
3740use List::Util qw(min max);
3741
3742use CFClient::OpenGL;
3743
3744sub new {
3745 my $class = shift;
3746
3747 my $self = $class->SUPER::new (
2983 visible => 1, 3748 visible => 1,
2984 @_, 3749 @_,
2985 ) 3750 );
2986}
2987 3751
2988sub configure { 3752 Scalar::Util::weaken ($self->{root} = $self);
2989 my ($self, $x, $y, $w, $h) = @_;
2990 3753
2991 $self->{w} = $w; 3754 $self
2992 $self->{h} = $h;
2993}
2994
2995sub check_size {
2996 my ($self) = @_;
2997
2998 $self->size_allocate ($self->{w}, $self->{h})
2999 if $self->{w};
3000} 3755}
3001 3756
3002sub size_request { 3757sub size_request {
3003 my ($self) = @_; 3758 my ($self) = @_;
3004 3759
3005 ($self->{w}, $self->{h}) 3760 ($self->{w}, $self->{h})
3761}
3762
3763sub _to_pixel {
3764 my ($coord, $size, $max) = @_;
3765
3766 $coord =
3767 $coord eq "center" ? ($max - $size) * 0.5
3768 : $coord eq "max" ? $max
3769 : $coord;
3770
3771 $coord = 0 if $coord < 0;
3772 $coord = $max - $size if $coord > $max - $size;
3773
3774 int $coord + 0.5
3006} 3775}
3007 3776
3008sub size_allocate { 3777sub size_allocate {
3009 my ($self, $w, $h) = @_; 3778 my ($self, $w, $h) = @_;
3010 3779
3011 for my $child ($self->children) { 3780 for my $child ($self->children) {
3012 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3781 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3013 3782
3014 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3783 $X = $child->{force_x} if exists $child->{force_x};
3015 if exists $child->{req_x}; 3784 $Y = $child->{force_y} if exists $child->{force_y};
3016 3785
3017 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3786 $X = _to_pixel $X, $W, $self->{w};
3018 if exists $child->{req_y}; 3787 $Y = _to_pixel $Y, $H, $self->{h};
3019
3020 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3021
3022 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3023 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3024 3788
3025 $child->configure ($X, $Y, $W, $H); 3789 $child->configure ($X, $Y, $W, $H);
3026 } 3790 }
3027} 3791}
3028 3792
… …
3039} 3803}
3040 3804
3041sub update { 3805sub update {
3042 my ($self) = @_; 3806 my ($self) = @_;
3043 3807
3044 $self->check_size;
3045 $::WANT_REFRESH++; 3808 $::WANT_REFRESH++;
3046} 3809}
3047 3810
3048sub add { 3811sub add {
3049 my ($self, @children) = @_; 3812 my ($self, @children) = @_;
3050 3813
3051 for my $child (@children) {
3052 $child->{is_toplevel} = 1; 3814 $_->{is_toplevel} = 1
3053 3815 for @children;
3054 # integerise window positions
3055 $child->{x} = int $child->{x};
3056 $child->{y} = int $child->{y};
3057 }
3058 3816
3059 $self->SUPER::add (@children); 3817 $self->SUPER::add (@children);
3060
3061 for (my @widgets = @children; my $w = pop @widgets; ) {
3062 push @widgets, $w->children;
3063 $w->set_visible;
3064 }
3065
3066} 3818}
3067 3819
3068sub remove { 3820sub remove {
3069 my ($self, @children) = @_; 3821 my ($self, @children) = @_;
3070 3822
3071 $self->SUPER::remove (@children); 3823 $self->SUPER::remove (@children);
3824
3825 delete $self->{is_toplevel}
3826 for @children;
3072 3827
3073 while (@children) { 3828 while (@children) {
3074 my $w = pop @children; 3829 my $w = pop @children;
3075 push @children, $w->children; 3830 push @children, $w->children;
3076 $w->set_invisible; 3831 $w->set_invisible;
… …
3095 while ($self->{refresh_hook}) { 3850 while ($self->{refresh_hook}) {
3096 $_->() 3851 $_->()
3097 for values %{delete $self->{refresh_hook}}; 3852 for values %{delete $self->{refresh_hook}};
3098 } 3853 }
3099 3854
3100 if ($self->{check_size}) { 3855 if ($self->{realloc}) {
3856 my %queue;
3101 my @queue; 3857 my @queue;
3858 my $widget;
3102 3859
3860 outer:
3103 while () { 3861 while () {
3104 if ($self->{check_size}) { 3862 if (my $realloc = delete $self->{realloc}) {
3105 #TODO use array-of-depth approach 3863 for $widget (values %$realloc) {
3864 $widget->{visible} or next; # do not resize invisible widgets
3106 3865
3107 @queue = sort { $a->{visible} <=> $b->{visible} } 3866 $queue{$widget+0}++ and next; # duplicates are common
3108 @queue, values %{delete $self->{check_size}}; 3867
3868 push @{ $queue[$widget->{visible}] }, $widget;
3869 }
3109 } 3870 }
3110 3871
3872 while () {
3873 @queue or last outer;
3874
3111 my $widget = pop @queue || last; 3875 $widget = pop @{ $queue[-1] || [] }
3112 3876 and last;
3113 defined $widget->{visible} or last; # do not resize invisible widgets
3114
3115 my ($w, $h) = $widget->{def_w} && $widget->{def_h}
3116 ? @$widget{qw(def_w def_h)}
3117 : $widget->size_request;
3118
3119 if (delete $widget->{force_alloc}
3120 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3121 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3122 3877
3878 pop @queue;
3879 }
3880
3881 delete $queue{$widget+0};
3882
3883 my ($w, $h) = $widget->size_request;
3884
3885 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3886 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3887
3888 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3889 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3890
3891 $w = $widget->{force_w} if exists $widget->{force_w};
3892 $h = $widget->{force_h} if exists $widget->{force_h};
3893
3894 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3895 || delete $widget->{force_realloc}) {
3123 $widget->{req_w} = $w; 3896 $widget->{req_w} = $w;
3124 $widget->{req_h} = $h; 3897 $widget->{req_h} = $h;
3125 3898
3126 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3899 $self->{size_alloc}{$widget+0} = $widget;
3127 3900
3128 $widget->{parent}->check_size
3129 if $widget->{parent}; 3901 if (my $parent = $widget->{parent}) {
3902 $self->{realloc}{$parent+0} = $parent
3903 unless $queue{$parent+0};
3904
3905 $parent->{force_size_alloc} = 1;
3906 $self->{size_alloc}{$parent+0} = $parent;
3907 }
3130 } 3908 }
3909
3910 delete $self->{realloc}{$widget+0};
3131 } 3911 }
3132 } 3912 }
3133 3913
3134 while (my $size_alloc = delete $self->{size_alloc}) { 3914 while (my $size_alloc = delete $self->{size_alloc}) {
3135 my @queue = sort $b->[0]{visible} <=> $a->[0]{visible}, 3915 my @queue = sort { $b->{visible} <=> $a->{visible} }
3136 values %$size_alloc; 3916 values %$size_alloc;
3137 3917
3138 while () { 3918 while () {
3139 my ($widget, $w, $h) = @{ pop @queue or last }; 3919 my $widget = pop @queue || last;
3920
3921 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3140 3922
3141 $w = 0 if $w < 0; 3923 $w = 0 if $w < 0;
3142 $h = 0 if $h < 0; 3924 $h = 0 if $h < 0;
3143 3925
3926 $w = int $w + 0.5;
3927 $h = int $h + 0.5;
3928
3929 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3930 $widget->{old_w} = $widget->{w};
3931 $widget->{old_h} = $widget->{h};
3932
3144 $widget->{w} = $w; 3933 $widget->{w} = $w;
3145 $widget->{h} = $h; 3934 $widget->{h} = $h;
3935
3146 $widget->emit (size_allocate => $w, $h); 3936 $widget->emit (size_allocate => $w, $h);
3937 }
3147 } 3938 }
3148 } 3939 }
3149 3940
3150 while ($self->{post_alloc_hook}) { 3941 while ($self->{post_alloc_hook}) {
3151 $_->() 3942 $_->()
3152 for values %{delete $self->{post_alloc_hook}}; 3943 for values %{delete $self->{post_alloc_hook}};
3153 } 3944 }
3945
3154 3946
3155 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3947 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3156 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3948 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3157 glClear GL_COLOR_BUFFER_BIT; 3949 glClear GL_COLOR_BUFFER_BIT;
3158 3950
… …
3160 glLoadIdentity; 3952 glLoadIdentity;
3161 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3953 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3162 glMatrixMode GL_MODELVIEW; 3954 glMatrixMode GL_MODELVIEW;
3163 glLoadIdentity; 3955 glLoadIdentity;
3164 3956
3957 {
3958 package CFClient::UI::Base;
3959
3960 ($draw_x, $draw_y, $draw_w, $draw_h) =
3961 (0, 0, $self->{w}, $self->{h});
3962 }
3963
3165 $self->_draw; 3964 $self->_draw;
3166} 3965}
3167 3966
3168############################################################################# 3967#############################################################################
3169 3968

Diff Legend

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