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

Diff Legend

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