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.240 by root, Fri May 26 18:28:23 2006 UTC vs.
Revision 1.296 by root, Wed Jun 7 05:48:53 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
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 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;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 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
158 $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.]+$/;
159 $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};
160 $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};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $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.]+$/;
163 $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};
164 $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};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
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};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
233 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
234 delete $self->{visible}; 278 delete $self->{visible};
235 279
236 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
238 282
239 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
241 285
242 $self->focus_out; 286 $self->focus_out;
287
288 $self->emit (visibility_change => 0);
289}
290
291sub set_visibility {
292 my ($self, $visible) = @_;
293
294 return if $self->{visible} == $visible;
295
296 $visible ? $self->hide
297 : $self->show;
298}
299
300sub toggle_visibility {
301 my ($self) = @_;
302
303 $self->{visible}
304 ? $self->hide
305 : $self->show;
243} 306}
244 307
245sub hide { 308sub hide {
246 my ($self) = @_; 309 my ($self) = @_;
247 310
… …
249 312
250 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
251 if $self->{parent}; 314 if $self->{parent};
252} 315}
253 316
254sub move { 317sub move_abs {
255 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
256 319
257 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
258 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
259 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
260 323
261 $self->update; 324 $self->update;
262} 325}
263 326
264sub set_size { 327sub set_size {
265 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
266 329
267 $self->{user_w} = $w; 330 $self->{force_w} = $w;
268 $self->{user_h} = $h; 331 $self->{force_h} = $h;
269 332
270 $self->check_size; 333 $self->realloc;
271} 334}
272 335
273sub size_request { 336sub size_request {
274 require Carp; 337 require Carp;
275 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
277 340
278sub configure { 341sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
280 343
281 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
284 349
285 # use alignment to adjust x, y 350 # use alignment to adjust x, y
286 351
287 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 354 }
292 355
293 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 357 $self->{x} = $x;
295 $self->{y} = $y; 358 $self->{y} = $y;
296 $self->update; 359 $self->update;
297 } 360 }
298 361
299 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $CFClient::UI::ROOT->{size_alloc}{$self} = [$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;
301 } 369 }
302} 370}
303 371
304sub size_allocate { 372sub size_allocate {
305 # nothing to be done 373 # nothing to be done
306} 374}
307 375
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
316} 382}
317 383
318sub set_max_size { 384sub set_max_size {
319 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
320 386
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
323} 391}
324 392
325sub set_tooltip { 393sub set_tooltip {
326 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
327 395
… …
332 400
333 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
334 402
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
338 } 406 }
339} 407}
340 408
341# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
342sub coord2local { 410sub coord2local {
… …
379 447
380 $::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
381 unless $FOCUS; 449 unless $FOCUS;
382} 450}
383 451
384sub mouse_motion { } 452sub mouse_motion { 0 }
385sub button_up { } 453sub button_up { 0 }
386sub key_down { } 454sub key_down { 0 }
387sub key_up { } 455sub key_up { 0 }
388 456
389sub button_down { 457sub button_down {
390 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
391 459
392 $self->focus_in; 460 $self->focus_in;
393}
394 461
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
399sub 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
400 538
401sub draw { 539sub draw {
402 my ($self) = @_; 540 my ($self) = @_;
403 541
404 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);
405 553
406 glPushMatrix; 554 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 556
411 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 559 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 561 glBegin GL_QUADS;
418 glVertex $x , $y; 562 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
422 glEnd; 566 glEnd;
423 glDisable GL_BLEND; 567 glDisable GL_BLEND;
424 } 568 }
425 569
426 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 571 glPushMatrix;
428 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 575 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
435 glEnd; 579 glEnd;
436 glPopMatrix; 580 glPopMatrix;
437 #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;
438 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
439} 586}
440 587
441sub _draw { 588sub _draw {
442 my ($self) = @_; 589 my ($self) = @_;
443 590
444 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
445}
446
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505} 592}
506 593
507sub DESTROY { 594sub DESTROY {
508 my ($self) = @_; 595 my ($self) = @_;
509 596
… …
541 628
542 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
544 631
545 glEnable GL_BLEND; 632 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 634 glColor_premultiply @$color;
548 635
549 glBegin GL_QUADS; 636 glBegin GL_QUADS;
550 glVertex 0 , 0; 637 glVertex 0 , 0;
551 glVertex 0 , $h; 638 glVertex 0 , $h;
552 glVertex $w, $h; 639 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
569} 656}
570 657
571sub size_request { 658sub size_request {
572 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
573} 662}
574 663
575sub draw { } 664sub draw { }
576 665
577############################################################################# 666#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
582 671
583sub new { 672sub new {
584 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
585 674
586 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
587 676
588 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
589 children => [], 678 children => [],
590 can_events => 0, 679 can_events => 0,
591 %arg, 680 %arg,
592 ); 681 );
682
593 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
594 685
595 $self 686 $self
596} 687}
597 688
598sub add { 689sub add {
… …
606 $self->{children} = [ 697 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
609 ]; 700 ];
610 701
611 $self->check_size (1); 702 $self->realloc;
612 $self->update;
613} 703}
614 704
615sub children { 705sub children {
616 @{ $_[0]{children} } 706 @{ $_[0]{children} }
617} 707}
… …
622 delete $child->{parent}; 712 delete $child->{parent};
623 $child->hide; 713 $child->hide;
624 714
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 716
627 $self->check_size (1); 717 $self->realloc;
628 $self->update;
629} 718}
630 719
631sub clear { 720sub clear {
632 my ($self) = @_; 721 my ($self) = @_;
633 722
… …
637 for (@$children) { 726 for (@$children) {
638 delete $_->{parent}; 727 delete $_->{parent};
639 $_->hide; 728 $_->hide;
640 } 729 }
641 730
642 $self->check_size; 731 $self->realloc;
643 $self->update;
644} 732}
645 733
646sub find_widget { 734sub find_widget {
647 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
648 736
649 $x -= $self->{x}; 737 $x -= $self->{x};
650 $y -= $self->{y}; 738 $y -= $self->{y};
651 739
652 my $res; 740 my $res;
653 741
654 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
656 and return $res; 744 and return $res;
657 } 745 }
658 746
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
708 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
709} 797}
710 798
711############################################################################# 799#############################################################################
712 800
801# back-buffered drawing area
802
713package CFClient::UI::Window; 803package CFClient::UI::Window;
714 804
715our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
716 806
717use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
735 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 826 $self->update;
737} 827}
738 828
739sub _render { 829sub _render {
830 my ($self) = @_;
831
740 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
741} 833}
742 834
743sub render_child { 835sub render_child {
744 my ($self) = @_; 836 my ($self) = @_;
745 837
746 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
747 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
749 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
750 $self->_render; 849 $self->_render;
751 }; 850 };
752} 851}
753 852
754sub _draw { 853sub _draw {
755 my ($self) = @_; 854 my ($self) = @_;
756 855
757 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
758 857
759 my $tex = $self->{texture} 858 my $tex = $self->{texture}
760 or return; 859 or return;
761 860
762 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
765 864
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 866
768 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
769} 868}
… …
785} 884}
786 885
787sub size_request { 886sub size_request {
788 my ($self) = @_; 887 my ($self) = @_;
789 888
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 890
792 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
793} 895}
794 896
795sub size_allocate { 897sub size_allocate {
796 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
797 899
900 my $child = $self->child;
901
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 904
801 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
802 $self->update; 906 $self->update;
803} 907}
804 908
… …
840} 944}
841 945
842sub _render { 946sub _render {
843 my ($self) = @_; 947 my ($self) = @_;
844 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 953
847 $self->SUPER::_render; 954 $self->SUPER::_render;
848} 955}
849 956
… …
852package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
853 960
854our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
855 962
856sub new { 963sub new {
857 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
858 967
859 my $self; 968 my $self;
860 969
861 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
862 vertical => 1, 971 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 973 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
866 }, 975 },
867 ; 976 ;
868 977
869 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 980 slider => $slider,
872 @_, 981 %arg,
873 ); 982 );
874 983
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
878 986
879 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
880} 994}
881 995
882sub update { 996sub update {
883 my ($self) = @_; 997 my ($self) = @_;
884 998
… …
923 1037
924 if ($self->{bg}) { 1038 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
926 1040
927 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
930 1044
931 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
932 glVertex 0 , 0; 1046 glVertex 0 , 0;
933 glVertex 0 , $h; 1047 glVertex 0 , $h;
934 glVertex $w, $h; 1048 glVertex $w, $h;
… …
947 1061
948our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
949 1063
950use CFClient::OpenGL; 1064use CFClient::OpenGL;
951 1065
952my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
955 1073
956sub new { 1074sub new {
957 my $class = shift; 1075 my ($class, %arg) = @_;
958 1076
959 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
960 1078
961 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1082 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1083 can_events => 1,
967 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
968 ); 1087 );
969 1088
970 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
971 align => 0, 1090 align => 0,
972 valign => 1, 1091 valign => 1,
973 text => $self->{title}, 1092 text => $title,
974 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
975 1095
976 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
977} 1104}
978 1105
979sub border { 1106sub border {
980 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
981} 1108}
982 1109
983sub size_request { 1110sub size_request {
984 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
985 1115
986 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
987 1117
988 ( 1118 (
989 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
992} 1122}
993 1123
994sub size_allocate { 1124sub size_allocate {
995 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
996 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
997 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
999 1137
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1004} 1139}
1005 1140
1006sub button_down { 1141sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1008 1143
… …
1024 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1025 1160
1026 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1028 1163
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1168 $self->realloc;
1033 }; 1169 };
1034 1170
1035 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1175 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1041 1177
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1179
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1047 } 1188 1
1048} 1189}
1049 1190
1050sub button_up { 1191sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1052 1193
1053 delete $self->{motion}; 1194 !!delete $self->{motion}
1054} 1195}
1055 1196
1056sub mouse_motion { 1197sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1058 1199
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1060} 1203}
1061 1204
1062sub _draw { 1205sub _draw {
1063 my ($self) = @_; 1206 my ($self) = @_;
1064 1207
1208 my $child = $self->{children}[0];
1209
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1212
1068 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1215
1071 my $border = $self->border; 1216 my $border = $self->border;
1072 1217
1073 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1223
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1081 1226
1082 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1232 }
1093 1233
1094 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1095 1235
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1099} 1242}
1100 1243
1101############################################################################# 1244#############################################################################
1102 1245
1103package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1126 1269
1127 $child->set_parent ($self); 1270 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1129 1272
1130 $self->check_size (1); 1273 $self->realloc;
1131} 1274}
1132 1275
1133# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1134sub clear { 1277sub clear {
1135 my ($self) = @_; 1278 my ($self) = @_;
… …
1140 for (@children) { 1283 for (@children) {
1141 delete $_->{parent}; 1284 delete $_->{parent};
1142 $_->hide; 1285 $_->hide;
1143 } 1286 }
1144 1287
1145 $self->check_size (1); 1288 $self->realloc;
1146 $self->update;
1147} 1289}
1148 1290
1149sub get_wh { 1291sub get_wh {
1150 my ($self) = @_; 1292 my ($self) = @_;
1151 1293
… …
1247 } 1389 }
1248} 1390}
1249 1391
1250############################################################################# 1392#############################################################################
1251 1393
1252package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1395
1256our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1257 1397
1258sub size_request { 1398sub size_request {
1259 my ($self) = @_; 1399 my ($self) = @_;
1260 1400
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1262 1402 ? (
1263 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1405 )
1266 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1267} 1410}
1268 1411
1269sub size_allocate { 1412sub size_allocate {
1270 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1271 1414
1272 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1416 my $children = $self->{children};
1275 1417
1276 my @h = map $_->{req_w}, @$children; 1418 my @req;
1277 1419
1278 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1279 1421 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1436 }
1294 } 1437 }
1295 1438
1296 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1297 1440
1298 my $y = 0; 1441 my $pos = 0;
1299 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1445
1304 $y += $h; 1446 $pos += $alloc;
1305 } 1447 }
1306 1448
1307 1 1449 1
1308} 1450}
1309 1451
1310############################################################################# 1452#############################################################################
1311 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1312package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1313 1470
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1317 1472
1318sub size_request { 1473sub new {
1319 my ($self) = @_; 1474 my $class = shift;
1320 1475
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1322 1477 vertical => 1,
1323 ( 1478 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1479 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1480}
1367 1481
1368############################################################################# 1482#############################################################################
1369 1483
1370package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1501 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1389 fontsize => 1, 1503 fontsize => 1,
1390 align => -1, 1504 align => -1,
1391 valign => -1, 1505 valign => -1,
1392 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1393 can_events => 0, 1508 can_events => 0,
1394 %arg 1509 %arg
1395 ); 1510 );
1396 1511
1397 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1424 1539
1425 delete $self->{texture}; 1540 delete $self->{texture};
1426 $self->SUPER::update; 1541 $self->SUPER::update;
1427} 1542}
1428 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1429sub set_text { 1551sub set_text {
1430 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1431 1553
1432 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1434 1556
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1437 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1438 $self->update; 1562 $self->update;
1439 $self->check_size;
1440} 1563}
1441 1564
1442sub set_markup { 1565sub set_markup {
1443 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1444 1567
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1572
1450 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1451 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1452 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1453 $self->update; 1578 $self->update;
1454 $self->check_size;
1455} 1579}
1456 1580
1457sub size_request { 1581sub size_request {
1458 my ($self) = @_; 1582 my ($self) = @_;
1459 1583
1584 $self->{size_req} ||= do {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1590
1466 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1467 1592
1468 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1596
1472 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1473 1598
1474 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1476 } 1604 };
1477 1605
1478 ( 1606 @{ $self->{size_req} }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1607}
1483 1608
1484sub size_allocate { 1609sub size_allocate {
1485 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1486 1611
1612 delete $self->{ox};
1613
1487 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1616}
1489 1617
1490sub set_fontsize { 1618sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1492 1620
1493 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1622 delete $self->{texture};
1495 1623
1496 $self->update; 1624 $self->realloc;
1497 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1498} 1633}
1499 1634
1500sub _draw { 1635sub _draw {
1501 my ($self) = @_; 1636 my ($self) = @_;
1502 1637
… …
1508 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1647
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1514 1650
1651 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1518 1655
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1659 };
1525 1660
1526 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1662
1663 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1664 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1528 1665
1529 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1530 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1532 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1534 } 1673 }
1535 1674
1536 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1537} 1676}
1538 1677
… …
1555 can_hover => 1, 1694 can_hover => 1,
1556 can_focus => 1, 1695 can_focus => 1,
1557 valign => 0, 1696 valign => 0,
1558 can_events => 1, 1697 can_events => 1,
1559 #text => ... 1698 #text => ...
1699 #hidden => "*",
1560 @_ 1700 @_
1561 ) 1701 )
1562} 1702}
1563 1703
1564sub _set_text { 1704sub _set_text {
… …
1566 1706
1567 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1568 1708
1569 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1570 1710
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1712 $self->{text} = $text;
1575 1713
1576 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1578 1717
1579 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1580} 1722}
1581 1723
1582sub set_text { 1724sub set_text {
1583 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1584 1726
1585 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1728 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1729}
1590 1730
1591sub get_text { 1731sub get_text {
1592 $_[0]{text} 1732 $_[0]{text}
1593} 1733}
… …
1623 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1626 } elsif ($uni) { 1766 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1628 } 1770 }
1629 1771
1630 $self->_set_text ($text); 1772 $self->_set_text ($text);
1631 $self->update; 1773
1632 $self->check_size; 1774 $self->realloc;
1775
1776 1
1633} 1777}
1634 1778
1635sub focus_in { 1779sub focus_in {
1636 my ($self) = @_; 1780 my ($self) = @_;
1637 1781
… …
1652 utf8::encode $text; 1796 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1654 1798
1655 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1656 $self->update; 1800 $self->update;
1801
1802 1
1657} 1803}
1658 1804
1659sub mouse_motion { 1805sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1661# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1807# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1808
1809 0
1662} 1810}
1663 1811
1664sub _draw { 1812sub _draw {
1665 my ($self) = @_; 1813 my ($self) = @_;
1666 1814
1667 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1668 1816
1669 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1672 } else { 1820 } else {
1673 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1674 } 1822 }
1675 1823
1676 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1827 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1743 } else { 1891 } else {
1744 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1745 } 1893 }
1746 1894
1747 } else { 1895 } else {
1748 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1749 } 1899 1
1750
1751} 1900}
1752 1901
1753############################################################################# 1902#############################################################################
1754 1903
1755package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1764 1913
1765sub new { 1914sub new {
1766 my $class = shift; 1915 my $class = shift;
1767 1916
1768 $class->SUPER::new ( 1917 $class->SUPER::new (
1769 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1770 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1772 can_hover => 1, 1922 can_hover => 1,
1773 align => 0, 1923 align => 0,
1774 valign => 0, 1924 valign => 0,
… …
1783 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1784 1934
1785 $self->emit ("activate") 1935 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1788} 1940}
1789 1941
1790sub _draw { 1942sub _draw {
1791 my ($self) = @_; 1943 my ($self) = @_;
1792 1944
1793 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1946
1799 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1802 1950
… …
1821 1969
1822sub new { 1970sub new {
1823 my $class = shift; 1971 my $class = shift;
1824 1972
1825 $class->SUPER::new ( 1973 $class->SUPER::new (
1826 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1827 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1980 state => 0,
… …
1835} 1984}
1836 1985
1837sub size_request { 1986sub size_request {
1838 my ($self) = @_; 1987 my ($self) = @_;
1839 1988
1840 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1841} 1990}
1842 1991
1843sub button_down { 1992sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1845 1994
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1850 } 2003 1
1851} 2004}
1852 2005
1853sub _draw { 2006sub _draw {
1854 my ($self) = @_; 2007 my ($self) = @_;
1855 2008
1856 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1857 2010
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2012
1860 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2013 my ($w, $h) = @$self{qw(w h)};
2014
2015 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1861 2016
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2018
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2020
… …
2020 2175
2021 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2023 2178
2024 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2025 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2180 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2181 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2026 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2184
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2130 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2137 vertical => 0, 2293 vertical => 0,
2138 can_hover => 1, 2294 can_hover => 1,
2139 inner_pad => 0.02, 2295 inner_pad => 0.02,
2140 @_ 2296 @_
2141 ); 2297 );
… …
2144 $self->update; 2300 $self->update;
2145 2301
2146 $self 2302 $self
2147} 2303}
2148 2304
2305sub changed { }
2306
2149sub set_range { 2307sub set_range {
2150 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2151 2309
2152 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2153 2311
2154 $self->update
2155 if "@$range" ne "@{$self->{range}}"; 2312 if ("@$range" ne "@{$self->{range}}") {
2313 $self->update;
2314 $self->set_value ($self->{range}[0]);
2315 }
2156} 2316}
2157 2317
2158sub set_value { 2318sub set_value {
2159 my ($self, $value) = @_; 2319 my ($self, $value) = @_;
2160 2320
… …
2179} 2339}
2180 2340
2181sub size_request { 2341sub size_request {
2182 my ($self) = @_; 2342 my ($self) = @_;
2183 2343
2184 my $w = $self->{req_w}; 2344 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2345}
2189 2346
2190sub button_down { 2347sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2192 2349
2193 $self->SUPER::button_down ($ev, $x, $y); 2350 $self->SUPER::button_down ($ev, $x, $y);
2194 2351
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2352 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2353
2197 $self->mouse_motion ($ev, $x, $y); 2354 $self->mouse_motion ($ev, $x, $y)
2198} 2355}
2199 2356
2200sub mouse_motion { 2357sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2358 my ($self, $ev, $x, $y) = @_;
2202 2359
… …
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2363 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2364
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2365 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2366
2210 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2367 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2368 } else {
2369 return 0;
2370 }
2371
2211 } 2372 1
2212} 2373}
2213 2374
2214sub update { 2375sub update {
2215 my ($self) = @_; 2376 my ($self) = @_;
2216 2377
2217 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2378 delete $self->{knob_w};
2379 $self->SUPER::update;
2380}
2381
2382sub _draw {
2383 my ($self) = @_;
2384
2385 unless ($self->{knob_w}) {
2218 $self->set_value ($self->{range}[0]); 2386 $self->set_value ($self->{range}[0]);
2219 2387
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2388 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2389 my $range = ($hi - $page - $lo) || 1e-100;
2222 2390
… …
2228 $value = ($value - $lo) / $range; 2396 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2397 $value = $value * $self->{scale} + $self->{offset};
2230 2398
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2399 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2400 $self->{knob_w} = $knob_w;
2233 }); 2401 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2402
2241 $self->SUPER::_draw (); 2403 $self->SUPER::_draw ();
2242 2404
2243 glScale $self->{w}, $self->{h}; 2405 glScale $self->{w}, $self->{h};
2244 2406
… …
2317 my $class = shift; 2479 my $class = shift;
2318 2480
2319 my $self = $class->SUPER::new ( 2481 my $self = $class->SUPER::new (
2320 fontsize => 1, 2482 fontsize => 1,
2321 can_events => 0, 2483 can_events => 0,
2484 indent => 0,
2322 #font => default_font 2485 #font => default_font
2323 @_, 2486 @_,
2324 2487
2325 layout => (new CFClient::Layout 1), 2488 layout => (new CFClient::Layout 1),
2326 par => [], 2489 par => [],
… …
2349 $self->SUPER::size_allocate ($w, $h); 2512 $self->SUPER::size_allocate ($w, $h);
2350 2513
2351 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2514 $self->{layout}->set_font ($self->{font}) if $self->{font};
2352 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2515 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2353 $self->{layout}->set_width ($self->{children}[0]{w}); 2516 $self->{layout}->set_width ($self->{children}[0]{w});
2517 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2354 2518
2355 $self->reflow; 2519 $self->reflow;
2356} 2520}
2357 2521
2358sub text_size { 2522sub text_size {
… …
2360 2524
2361 my $layout = $self->{layout}; 2525 my $layout = $self->{layout};
2362 2526
2363 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2527 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2364 $layout->set_width ($self->{children}[0]{w} - $indent); 2528 $layout->set_width ($self->{children}[0]{w} - $indent);
2529 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2365 $layout->set_markup ($text); 2530 $layout->set_markup ($text);
2366 2531
2367 $layout->size 2532 $layout->size
2368} 2533}
2369 2534
… …
2408 2573
2409 return unless $self->{h} > 0; 2574 return unless $self->{h} > 0;
2410 2575
2411 delete $self->{texture}; 2576 delete $self->{texture};
2412 2577
2413 $ROOT->on_post_alloc ($self, sub { 2578 $ROOT->on_post_alloc ($self => sub {
2414 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2579 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2415 2580
2416 if (delete $self->{need_reflow}) { 2581 if (delete $self->{need_reflow}) {
2417 my $height = 0; 2582 my $height = 0;
2418 2583
… …
2421 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2586 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2422 2587
2423 for (@{$self->{par}}) { 2588 for (@{$self->{par}}) {
2424 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2589 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2425 $layout->set_width ($W - $_->[3]); 2590 $layout->set_width ($W - $_->[3]);
2591 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2426 $layout->set_markup ($_->[4]); 2592 $layout->set_markup ($_->[4]);
2427 my ($w, $h) = $layout->size; 2593 my ($w, $h) = $layout->size;
2428 $_->[0] = $w + $_->[3]; 2594 $_->[0] = $w + $_->[3];
2429 $_->[1] = $h; 2595 $_->[1] = $h;
2430 } 2596 }
… …
2433 } 2599 }
2434 2600
2435 $self->{height} = $height; 2601 $self->{height} = $height;
2436 2602
2437 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2603 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2438 2604
2439 delete $self->{texture}; 2605 delete $self->{texture};
2440 } 2606 }
2441 2607
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2608 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2609 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2610 glClear GL_COLOR_BUFFER_BIT;
2445 2611
2446 my $top = int $self->{children}[1]{range}[0]; 2612 my $top = int $self->{children}[1]{range}[0];
2447 2613
2448 my $y0 = $top; 2614 my $y0 = $top;
… …
2462 my $h = $par->[1]; 2628 my $h = $par->[1];
2463 2629
2464 if ($y0 < $y + $h && $y < $y1) { 2630 if ($y0 < $y + $h && $y < $y1) {
2465 $layout->set_foreground (@{ $par->[2] }); 2631 $layout->set_foreground (@{ $par->[2] });
2466 $layout->set_width ($W - $par->[3]); 2632 $layout->set_width ($W - $par->[3]);
2633 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2467 $layout->set_markup ($par->[4]); 2634 $layout->set_markup ($par->[4]);
2468 2635
2469 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2636 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2470 2637
2471 glRasterPos $par->[3], $y - $y0; 2638 glRasterPos $par->[3], $y - $y0;
… …
2483sub _draw { 2650sub _draw {
2484 my ($self) = @_; 2651 my ($self) = @_;
2485 2652
2486 glEnable GL_TEXTURE_2D; 2653 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2655 glColor 0, 0, 0, 1;
2489 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2656 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2490 glDisable GL_TEXTURE_2D; 2657 glDisable GL_TEXTURE_2D;
2491 2658
2492 $self->{children}[1]->draw; 2659 $self->{children}[1]->draw;
2493 2660
2494} 2661}
… …
2543 2710
2544sub new { 2711sub new {
2545 my $class = shift; 2712 my $class = shift;
2546 2713
2547 my $self = $class->SUPER::new ( 2714 my $self = $class->SUPER::new (
2548 state => 0, 2715 state => 0,
2549 connect_activate => \&toggle_flopper, 2716 on_activate => \&toggle_flopper,
2550 @_ 2717 @_
2551 ); 2718 );
2552 2719
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2720 $self
2559} 2721}
2560 2722
2561sub toggle_flopper { 2723sub toggle_flopper {
2562 my ($self) = @_; 2724 my ($self) = @_;
2563 2725
2564 # TODO: use animation 2726 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2727}
2576 2728
2577############################################################################# 2729#############################################################################
2578 2730
2579package CFClient::UI::Tooltip; 2731package CFClient::UI::Tooltip;
… …
2592} 2744}
2593 2745
2594sub set_tooltip_from { 2746sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2747 my ($self, $widget) = @_;
2596 2748
2749 my $tooltip = $widget->{tooltip};
2750
2751 if ($ENV{CFPLUS_DEBUG} & 2) {
2752 $tooltip .= "\n\n" . (ref $widget) . "\n"
2753 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2754 . "req $widget->{req_w} $widget->{req_h}\n"
2755 . "visible $widget->{visible}";
2756 }
2757
2597 $self->add (new CFClient::UI::Label 2758 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2759 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2760 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2761 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2762 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2763 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2764 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2775
2615sub size_allocate { 2776sub size_allocate {
2616 my ($self, $w, $h) = @_; 2777 my ($self, $w, $h) = @_;
2617 2778
2618 $self->SUPER::size_allocate ($w - 4, $h - 4); 2779 $self->SUPER::size_allocate ($w - 4, $h - 4);
2780}
2781
2782sub visibility_change {
2783 my ($self, $visible) = @_;
2784
2785 return unless $visible;
2786
2787 $self->{root}->on_post_alloc ("move_$self" => sub {
2788 my $widget = $self->{owner}
2789 or return;
2790
2791 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2792
2793 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2794 if $x + $self->{w} > $self->{root}{w};
2795
2796 $self->move_abs ($x, $y);
2797 });
2619} 2798}
2620 2799
2621sub _draw { 2800sub _draw {
2622 my ($self) = @_; 2801 my ($self) = @_;
2623 2802
… …
2640 glVertex $w, $h; 2819 glVertex $w, $h;
2641 glVertex $w, 0; 2820 glVertex $w, 0;
2642 glEnd; 2821 glEnd;
2643 2822
2644 glTranslate 2 - 0.375, 2 - 0.375; 2823 glTranslate 2 - 0.375, 2 - 0.375;
2824
2645 $self->SUPER::_draw; 2825 $self->SUPER::_draw;
2646} 2826}
2647 2827
2648############################################################################# 2828#############################################################################
2649 2829
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2888 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 2889
2710 if ($tex) { 2890 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 2891 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2892 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 2893 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2894 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 2895 glDisable GL_TEXTURE_2D;
2716 } 2896 }
2717} 2897}
2718 2898
… …
2725 $self->SUPER::DESTROY; 2905 $self->SUPER::DESTROY;
2726} 2906}
2727 2907
2728############################################################################# 2908#############################################################################
2729 2909
2730package CFClient::UI::Inventory; 2910package CFClient::UI::Buttonbar;
2731 2911
2732our @ISA = CFClient::UI::ScrolledWindow::; 2912our @ISA = CFClient::UI::HBox::;
2733 2913
2734sub new { 2914# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 2915
2775############################################################################# 2916#############################################################################
2776 2917
2777package CFClient::UI::Menu; 2918package CFClient::UI::Menu;
2778 2919
… …
2790 ); 2931 );
2791 2932
2792 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2933 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2793 2934
2794 for my $item (@{ $self->{items} }) { 2935 for my $item (@{ $self->{items} }) {
2795 my ($widget, $cb) = @$item; 2936 my ($widget, $cb, $tooltip) = @$item;
2796 2937
2797 # handle various types of items, only text for now 2938 # handle various types of items, only text for now
2798 if (!ref $widget) { 2939 if (!ref $widget) {
2799 $widget = new CFClient::UI::Label 2940 $widget = new CFClient::UI::Label
2800 can_hover => 1, 2941 can_hover => 1,
2801 can_events => 1, 2942 can_events => 1,
2802 text => $widget; 2943 text => $widget,
2944 tooltip => $tooltip
2803 } 2945 }
2804 2946
2805 $self->{item}{$widget} = $item; 2947 $self->{item}{$widget} = $item;
2806 2948
2807 $self->{vbox}->add ($widget); 2949 $self->{vbox}->add ($widget);
… …
2819 # maybe save $GRAB? must be careful about events... 2961 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2962 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2963 $self->{button} = $ev->{button};
2822 2964
2823 $self->show; 2965 $self->show;
2824 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2966 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2825} 2967}
2826 2968
2827sub mouse_motion { 2969sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2970 my ($self, $ev, $x, $y) = @_;
2829 2971
2830 # TODO: should use vbox->find_widget or so 2972 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2973 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2974 $self->{hover} = $self->{item}{$HOVER};
2975
2976 0
2833} 2977}
2834 2978
2835sub button_up { 2979sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2980 my ($self, $ev, $x, $y) = @_;
2837 2981
… …
2839 undef $GRAB; 2983 undef $GRAB;
2840 $self->hide; 2984 $self->hide;
2841 2985
2842 $self->_emit ("popdown"); 2986 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2987 $self->{hover}[1]->() if $self->{hover};
2988 } else {
2989 return 0
2990 }
2991
2844 } 2992 1
2845} 2993}
2846 2994
2847############################################################################# 2995#############################################################################
2848 2996
2849package CFClient::UI::Statusbox; 2997package CFClient::UI::Multiplexer;
2850 2998
2851our @ISA = CFClient::UI::VBox::; 2999our @ISA = CFClient::UI::Container::;
2852 3000
2853sub new { 3001sub new {
2854 my $class = shift; 3002 my $class = shift;
2855 3003
2856 $class->SUPER::new ( 3004 my $self = $class->SUPER::new (
3005 @_,
3006 );
3007
3008 $self->{current} = $self->{children}[0]
3009 if @{ $self->{children} };
3010
3011 $self
3012}
3013
3014sub add {
3015 my ($self, @widgets) = @_;
3016
3017 $self->SUPER::add (@widgets);
3018
3019 $self->{current} = $self->{children}[0]
3020 if @{ $self->{children} };
3021}
3022
3023sub set_current_page {
3024 my ($self, $page_or_widget) = @_;
3025
3026 my $widget = ref $page_or_widget
3027 ? $page_or_widget
3028 : $self->{children}[$page_or_widget];
3029
3030 $self->{current} = $widget;
3031 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3032
3033 $self->_emit (page_changed => $self->{current});
3034
3035 $self->realloc;
3036}
3037
3038sub visible_children {
3039 $_[0]{current}
3040}
3041
3042sub size_request {
3043 my ($self) = @_;
3044
3045 $self->{current}->size_request
3046}
3047
3048sub size_allocate {
3049 my ($self, $w, $h) = @_;
3050
3051 $self->{current}->configure (0, 0, $w, $h);
3052}
3053
3054sub _draw {
3055 my ($self) = @_;
3056
3057 $self->{current}->draw;
3058}
3059
3060#############################################################################
3061
3062package CFClient::UI::Notebook;
3063
3064our @ISA = CFClient::UI::VBox::;
3065
3066sub new {
3067 my $class = shift;
3068
3069 my $self = $class->SUPER::new (
3070 buttonbar => (new CFClient::UI::Buttonbar),
3071 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3072 # filter => # will be put between multiplexer and $self
3073 @_,
3074 );
3075
3076 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3077 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3078
3079 $self
3080}
3081
3082sub add {
3083 my ($self, $title, $widget, $tooltip) = @_;
3084
3085 Scalar::Util::weaken $self;
3086
3087 $self->{buttonbar}->add (new CFClient::UI::Button
3088 markup => $title,
3089 tooltip => $tooltip,
3090 on_activate => sub { $self->set_current_page ($widget) },
3091 );
3092
3093 $self->{multiplexer}->add ($widget);
3094}
3095
3096sub set_current_page {
3097 my ($self, $page) = @_;
3098
3099 $self->{multiplexer}->set_current_page ($page);
3100 $self->_emit (page_changed => $self->{multiplexer}{current});
3101}
3102
3103#############################################################################
3104
3105package CFClient::UI::Combobox;
3106
3107use utf8;
3108
3109our @ISA = CFClient::UI::Button::;
3110
3111sub new {
3112 my $class = shift;
3113
3114 my $self = $class->SUPER::new (
3115 options => [], # [title, value, tooltip], ...
3116 value => undef,
3117 @_,
3118 );
3119
3120 $self->_set_value ($self->{value});
3121
3122 $self
3123}
3124
3125sub button_down {
3126 my ($self, $ev) = @_;
3127
3128 my @menu_items;
3129
3130 for (@{ $self->{options} }) {
3131 my ($title, $value, $tooltip) = @$_;
3132
3133 push @menu_items, [$tooltip, sub { $self->set_value ($value) }];
3134 }
3135
3136 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3137}
3138
3139sub _set_value {
3140 my ($self, $value) = @_;
3141
3142 my ($item) = grep $_->[1] eq $value, @{ $self->{options} }
3143 or return;
3144
3145 $self->{value} = $item->[1];
3146 $self->set_markup ("$item->[0] ⇓");
3147 $self->set_tooltip ($item->[2]);
3148}
3149
3150sub set_value {
3151 my ($self, $value) = @_;
3152
3153 return unless $self->{value} ne $value;
3154
3155 $self->_set_value ($value);
3156 $self->_emit (changed => $value);
3157}
3158
3159#############################################################################
3160
3161package CFClient::UI::Statusbox;
3162
3163our @ISA = CFClient::UI::VBox::;
3164
3165sub new {
3166 my $class = shift;
3167
3168 my $self = $class->SUPER::new (
2857 fontsize => 0.8, 3169 fontsize => 0.8,
2858 @_, 3170 @_,
2859 ) 3171 );
3172
3173 Scalar::Util::weaken (my $this = $self);
3174
3175 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3176
3177 $self
2860} 3178}
2861 3179
2862sub reorder { 3180sub reorder {
2863 my ($self) = @_; 3181 my ($self) = @_;
2864 my $NOW = time; 3182 my $NOW = Time::HiRes::time;
3183
3184 # freeze display when hovering over any label
3185 return if $CFClient::UI::TOOLTIP->{owner}
3186 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3187 values %{ $self->{item} };
2865 3188
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3189 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3190 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3191 }
2869 3192
… …
2872 my @items = sort { 3195 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3196 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3197 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3198 } values %{ $self->{item} };
2876 3199
3200 $self->{timer}->interval (1);
3201
2877 my $count = 10 + 1; 3202 my $count = 10 + 1;
2878 for my $item (@items) { 3203 for my $item (@items) {
2879 last unless --$count; 3204 last unless --$count;
2880 3205
2881 push @widgets, $item->{label} ||= do { 3206 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3207 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3208 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3209 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3210 : $item->{text};
2886 3211
… …
2894 tooltip => $item->{tooltip}, 3219 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3220 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3221 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3222 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3223 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3224 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3225 can_events => 1,
2901 can_hover => 1 3226 can_hover => 1
2902 }; 3227 };
3228
3229 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3230 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3231 $label->update;
3232 $label->set_max_size (undef, $label->{req_h} * $diff)
3233 if $diff < 1;
3234 $self->{timer}->interval (1/30);
3235 } else {
3236 $label->{fg}[3] = $item->{fg}[3] || 1;
3237 }
3238
3239 push @widgets, $label;
2903 } 3240 }
2904 3241
2905 $self->clear; 3242 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3243 $self->SUPER::add (reverse @widgets);
2907} 3244}
… …
2912 $text =~ s/^\s+//; 3249 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3250 $text =~ s/\s+$//;
2914 3251
2915 return unless $text; 3252 return unless $text;
2916 3253
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3254 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3255
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3256 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3257
2921 if (my $item = $self->{item}{$group}) { 3258 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3259 if ($item->{text} eq $text) {
… …
2952 3289
2953 $self->reorder; 3290 $self->reorder;
2954 $self->SUPER::reconfigure; 3291 $self->SUPER::reconfigure;
2955} 3292}
2956 3293
3294sub DESTROY {
3295 my ($self) = @_;
3296
3297 $self->{timer}->cancel;
3298
3299 $self->SUPER::DESTROY;
3300}
3301
2957############################################################################# 3302#############################################################################
2958 3303
2959package CFClient::UI::Root; 3304package CFClient::UI::Inventory;
2960 3305
2961our @ISA = CFClient::UI::Container::; 3306our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3307
2965sub new { 3308sub new {
2966 my $class = shift; 3309 my $class = shift;
2967 3310
2968 $class->SUPER::new ( 3311 my $self = $class->SUPER::new (
3312 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3313 @_,
3314 );
3315
3316 $self
3317}
3318
3319sub set_items {
3320 my ($self, $items) = @_;
3321
3322 $self->{child}->clear;
3323 return unless $items;
3324
3325 my @items = sort {
3326 ($a->{type} <=> $b->{type})
3327 or ($a->{name} cmp $b->{name})
3328 } @$items;
3329
3330 $self->{real_items} = \@items;
3331
3332 my $row = 0;
3333 for my $item (@items) {
3334 CFClient::Item::update_widgets $item;
3335
3336 $self->{child}->add (0, $row, $item->{face_widget});
3337 $self->{child}->add (1, $row, $item->{desc_widget});
3338 $self->{child}->add (2, $row, $item->{weight_widget});
3339
3340 $row++;
3341 }
3342}
3343
3344#############################################################################
3345
3346package CFClient::UI::BindEditor;
3347
3348our @ISA = CFClient::UI::FancyFrame::;
3349
3350sub new {
3351 my $class = shift;
3352
3353 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3354
3355 $self->add (my $vb = new CFClient::UI::VBox);
3356
3357
3358 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3359 text => "start recording",
3360 tooltip => "Start/Stops recording of actions."
3361 ."All subsequent actions after the recording started will be captured."
3362 ."The actions are displayed after the record was stopped."
3363 ."To bind the action you have to click on the 'Bind' button",
3364 on_activate => sub {
3365 unless ($self->{recording}) {
3366 $self->start;
3367 } else {
3368 $self->stop;
3369 }
3370 });
3371
3372 $vb->add (new CFClient::UI::Label text => "Actions:");
3373 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3374
3375 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3376 $vb->add (my $hb = new CFClient::UI::HBox);
3377 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3378 $hb->add (new CFClient::UI::Button
3379 text => "bind",
3380 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3381 on_activate => sub {
3382 $self->ask_for_bind;
3383 });
3384
3385 $vb->add (my $hb = new CFClient::UI::HBox);
3386 $hb->add (new CFClient::UI::Button
3387 text => "ok",
3388 expand => 1,
3389 tooltip => "This closes the binding editor and saves the binding",
3390 on_activate => sub {
3391 $self->hide;
3392 $self->commit;
3393 });
3394
3395 $hb->add (new CFClient::UI::Button
3396 text => "cancel",
3397 expand => 1,
3398 tooltip => "This closes the binding editor without saving",
3399 on_activate => sub {
3400 $self->hide;
3401 $self->{binding_cancel}->()
3402 if $self->{binding_cancel};
3403 });
3404
3405 $self->update_binding_widgets;
3406
3407 $self
3408}
3409
3410sub commit {
3411 my ($self) = @_;
3412 my ($mod, $sym, $cmds) = $self->get_binding;
3413 if ($sym != 0 && @$cmds > 0) {
3414 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3415 ."'. Don't forget 'Save Config'!");
3416 $self->{binding_change}->($mod, $sym, $cmds)
3417 if $self->{binding_change};
3418 } else {
3419 $::STATUSBOX->add ("No action bound, no key or action specified!");
3420 $self->{binding_cancel}->()
3421 if $self->{binding_cancel};
3422 }
3423}
3424
3425sub start {
3426 my ($self) = @_;
3427
3428 $self->{rec_btn}->set_text ("stop recording");
3429 $self->{recording} = 1;
3430 $self->clear_command_list;
3431 $::CONN->start_record if $::CONN;
3432}
3433
3434sub stop {
3435 my ($self) = @_;
3436
3437 $self->{rec_btn}->set_text ("start recording");
3438 $self->{recording} = 0;
3439
3440 my $rec;
3441 $rec = $::CONN->stop_record if $::CONN;
3442 return unless ref $rec eq 'ARRAY';
3443 $self->set_command_list ($rec);
3444}
3445
3446
3447sub ask_for_bind_and_commit {
3448 my ($self) = @_;
3449 $self->ask_for_bind (1);
3450}
3451
3452sub ask_for_bind {
3453 my ($self, $commit) = @_;
3454
3455 CFClient::Binder::open_binding_dialog (sub {
3456 my ($mod, $sym) = @_;
3457 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3458 $self->update_binding_widgets;
3459 $self->commit if $commit;
3460 });
3461}
3462
3463# $mod and $sym are the modifiers and key symbol
3464# $cmds is a array ref of strings (the commands)
3465# $cb is the callback that is executed on OK
3466# $ccb is the callback that is executed on CANCEL and
3467# when the binding was unsuccessful on OK
3468sub set_binding {
3469 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3470
3471 $self->clear_command_list;
3472 $self->{recording} = 0;
3473 $self->{rec_btn}->set_text ("start recording");
3474
3475 $self->{binding} = [$mod, $sym];
3476 $self->{commands} = $cmds;
3477
3478 $self->{binding_change} = $cb;
3479 $self->{binding_cancel} = $ccb;
3480
3481 $self->update_binding_widgets;
3482}
3483
3484# this is a shortcut method that asks for a binding
3485# and then just binds it.
3486sub do_quick_binding {
3487 my ($self, $cmds) = @_;
3488 $self->set_binding (undef, undef, $cmds, sub {
3489 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3490 });
3491 $self->ask_for_bind (1);
3492}
3493
3494sub update_binding_widgets {
3495 my ($self) = @_;
3496 my ($mod, $sym, $cmds) = $self->get_binding;
3497 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3498 $self->set_command_list ($cmds);
3499}
3500
3501sub get_binding {
3502 my ($self) = @_;
3503 return (
3504 $self->{binding}->[0],
3505 $self->{binding}->[1],
3506 [ grep { defined $_ } @{$self->{commands}} ]
3507 );
3508}
3509
3510sub clear_command_list {
3511 my ($self) = @_;
3512 $self->{cmdbox}->clear ();
3513}
3514
3515sub set_command_list {
3516 my ($self, $cmds) = @_;
3517
3518 $self->{cmdbox}->clear ();
3519 $self->{commands} = $cmds;
3520
3521 my $idx = 0;
3522
3523 for (@$cmds) {
3524 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3525
3526 my $i = $idx;
3527 $hb->add (new CFClient::UI::Label text => $_);
3528 $hb->add (new CFClient::UI::Button
3529 text => "delete",
3530 tooltip => "Deletes the action from the record",
3531 on_activate => sub {
3532 $self->{cmdbox}->remove ($hb);
3533 $cmds->[$i] = undef;
3534 });
3535
3536
3537 $idx++
3538 }
3539}
3540
3541#############################################################################
3542
3543package CFClient::UI::SpellList;
3544
3545our @ISA = CFClient::UI::Table::;
3546
3547sub new {
3548 my $class = shift;
3549
3550 my $self = $class->SUPER::new (
3551 binding => [],
3552 commands => [],
2969 @_, 3553 @_,
2970 ) 3554 )
2971} 3555}
2972 3556
2973sub configure { 3557my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
2974 my ($self, $x, $y, $w, $h) = @_; 3558 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3559my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3560 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3561my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3562 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
2975 3563
2976 $self->{w} = $w; 3564sub rebuild_spell_list {
2977 $self->{h} = $h; 3565 my ($self) = @_;
2978}
2979 3566
2980sub check_size { 3567 $CFClient::UI::ROOT->on_refresh ($self => sub {
3568 $self->clear;
3569
3570 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3571 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3572 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3573 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3574
3575 my $row = 0;
3576
3577 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3578 my $spell = $self->{spell}{$_};
3579
3580 $row++;
3581
3582 $self->add (0, $row, new CFClient::UI::Face
3583 face => $spell->{face},
3584 can_hover => 1,
3585 can_events => 1,
3586 tooltip => $spell->{message},
3587 );
3588
3589 $self->add (1, $row, new CFClient::UI::Label
3590 expand => 1,
3591 text => $spell->{name},
3592 can_hover => 1,
3593 can_events => 1,
3594 tooltip => $spell->{message},
3595 );
3596
3597 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3598 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3599 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3600
3601 # TODO: should be done via popup
3602 $self->add (5, $row, new CFClient::UI::Button
3603 text => "bind",
3604 tooltip => "bind spell readying (cast command) to key",
3605 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3606 );
3607 }
3608 });
3609}
3610
3611sub add_spell {
2981 my ($self) = @_; 3612 my ($self, $spell) = @_;
2982 3613
2983 $self->size_allocate ($self->{w}, $self->{h}) 3614 $self->{spell}->{$spell->{name}} = $spell;
2984 if $self->{w}; 3615 $self->rebuild_spell_list;
3616}
3617
3618sub remove_spell {
3619 my ($self, $spell) = @_;
3620
3621 delete $self->{spell}->{$spell->{name}};
3622 $self->rebuild_spell_list;
3623}
3624
3625#############################################################################
3626
3627package CFClient::UI::Root;
3628
3629our @ISA = CFClient::UI::Container::;
3630
3631use List::Util qw(min max);
3632
3633use CFClient::OpenGL;
3634
3635sub new {
3636 my $class = shift;
3637
3638 my $self = $class->SUPER::new (
3639 visible => 1,
3640 @_,
3641 );
3642
3643 Scalar::Util::weaken ($self->{root} = $self);
3644
3645 $self
2985} 3646}
2986 3647
2987sub size_request { 3648sub size_request {
2988 my ($self) = @_; 3649 my ($self) = @_;
2989 3650
2990 ($self->{w}, $self->{h}) 3651 ($self->{w}, $self->{h})
3652}
3653
3654sub _to_pixel {
3655 my ($coord, $size, $max) = @_;
3656
3657 $coord =
3658 $coord eq "center" ? ($max - $size) * 0.5
3659 : $coord eq "max" ? $max
3660 : $coord;
3661
3662 $coord = 0 if $coord < 0;
3663 $coord = $max - $size if $coord > $max - $size;
3664
3665 int $coord + 0.5
2991} 3666}
2992 3667
2993sub size_allocate { 3668sub size_allocate {
2994 my ($self, $w, $h) = @_; 3669 my ($self, $w, $h) = @_;
2995 3670
2996 for my $child ($self->children) { 3671 for my $child ($self->children) {
2997 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3672 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2998 3673
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3674 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3675 $Y = $child->{force_y} if exists $child->{force_y};
3001 3676
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3677 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3678 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3679
3008 $child->configure ($X, $Y, $W, $H); 3680 $child->configure ($X, $Y, $W, $H);
3009 } 3681 }
3010} 3682}
3011 3683
… …
3022} 3694}
3023 3695
3024sub update { 3696sub update {
3025 my ($self) = @_; 3697 my ($self) = @_;
3026 3698
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3699 $::WANT_REFRESH++;
3029} 3700}
3030 3701
3031sub add { 3702sub add {
3032 my ($self, @children) = @_; 3703 my ($self, @children) = @_;
3033 3704
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3705 $_->{is_toplevel} = 1
3042 3706 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3707
3048 $self->SUPER::add (@children); 3708 $self->SUPER::add (@children);
3049} 3709}
3050 3710
3051sub remove { 3711sub remove {
3052 my ($self, @children) = @_; 3712 my ($self, @children) = @_;
3053 3713
3054 $self->SUPER::remove (@children); 3714 $self->SUPER::remove (@children);
3715
3716 delete $self->{is_toplevel}
3717 for @children;
3055 3718
3056 while (@children) { 3719 while (@children) {
3057 my $w = pop @children; 3720 my $w = pop @children;
3058 push @children, $w->children; 3721 push @children, $w->children;
3059 $w->set_invisible; 3722 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3741 while ($self->{refresh_hook}) {
3079 $_->() 3742 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3743 for values %{delete $self->{refresh_hook}};
3081 } 3744 }
3082 3745
3083 if ($self->{check_size}) { 3746 if ($self->{realloc}) {
3084 my @queue = ([], []); 3747 my %queue;
3748 my @queue;
3749 my $widget;
3085 3750
3086 for (;;) { 3751 outer:
3087 if ($self->{check_size}) { 3752 while () {
3088 # heuristic: check containers last 3753 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3754 for $widget (values %$realloc) {
3090 for values %{delete $self->{check_size}} 3755 $widget->{visible} or next; # do not resize invisible widgets
3756
3757 $queue{$widget+0}++ and next; # duplicates are common
3758
3759 push @{ $queue[$widget->{visible}] }, $widget;
3760 }
3091 } 3761 }
3092 3762
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3763 while () {
3764 @queue or last outer;
3094 3765
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3766 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3767 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 3768
3769 pop @queue;
3770 }
3771
3772 delete $queue{$widget+0};
3773
3774 my ($w, $h) = $widget->size_request;
3775
3776 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3777 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3778
3779 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3780 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3781
3782 $w = $widget->{force_w} if exists $widget->{force_w};
3783 $h = $widget->{force_h} if exists $widget->{force_h};
3784
3785 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3786 || delete $widget->{force_realloc}) {
3103 $widget->{req_w} = $w; 3787 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3788 $widget->{req_h} = $h;
3105 3789
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3790 $self->{size_alloc}{$widget+0} = $widget;
3107 3791
3108 $widget->{parent}->check_size
3109 if $widget->{parent}; 3792 if (my $parent = $widget->{parent}) {
3793 $self->{realloc}{$parent+0} = $parent
3794 unless $queue{$parent+0};
3795
3796 $parent->{force_size_alloc} = 1;
3797 $self->{size_alloc}{$parent+0} = $parent;
3798 }
3110 } 3799 }
3800
3801 delete $self->{realloc}{$widget+0};
3111 } 3802 }
3112 } 3803 }
3113 3804
3114 while ($self->{size_alloc}) { 3805 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3806 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 my ($widget, $w, $h) = @$_; 3807 values %$size_alloc;
3808
3809 while () {
3810 my $widget = pop @queue || last;
3811
3812 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3117 3813
3118 $w = 0 if $w < 0; 3814 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3815 $h = 0 if $h < 0;
3120 3816
3817 $w = int $w + 0.5;
3818 $h = int $h + 0.5;
3819
3820 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3821 $widget->{old_w} = $widget->{w};
3822 $widget->{old_h} = $widget->{h};
3823
3121 $widget->{w} = $w; 3824 $widget->{w} = $w;
3122 $widget->{h} = $h; 3825 $widget->{h} = $h;
3826
3123 $widget->emit (size_allocate => $w, $h); 3827 $widget->emit (size_allocate => $w, $h);
3828 }
3124 } 3829 }
3125 } 3830 }
3126 3831
3127 while ($self->{post_alloc_hook}) { 3832 while ($self->{post_alloc_hook}) {
3128 $_->() 3833 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3834 for values %{delete $self->{post_alloc_hook}};
3130 } 3835 }
3836
3131 3837
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3838 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3839 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3840 glClear GL_COLOR_BUFFER_BIT;
3135 3841
… …
3137 glLoadIdentity; 3843 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3844 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3845 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3846 glLoadIdentity;
3141 3847
3848 {
3849 package CFClient::UI::Base;
3850
3851 ($draw_x, $draw_y, $draw_w, $draw_h) =
3852 (0, 0, $self->{w}, $self->{h});
3853 }
3854
3142 $self->_draw; 3855 $self->_draw;
3143} 3856}
3144 3857
3145############################################################################# 3858#############################################################################
3146 3859

Diff Legend

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