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.242 by elmex, Sat May 27 20:00:40 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;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
177 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
179 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
209 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
259 276
260 delete $self->{root}; 277 delete $self->{root};
261 delete $self->{visible}; 278 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $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;
270} 306}
271 307
272sub hide { 308sub hide {
273 my ($self) = @_; 309 my ($self) = @_;
274 310
… …
276 312
277 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
278 if $self->{parent}; 314 if $self->{parent};
279} 315}
280 316
281sub move { 317sub move_abs {
282 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
283 319
284 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
287 323
288 $self->update; 324 $self->update;
289} 325}
290 326
291sub set_size { 327sub set_size {
292 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
293 329
294 $self->{user_w} = $w; 330 $self->{force_w} = $w;
295 $self->{user_h} = $h; 331 $self->{force_h} = $h;
296 332
297 $self->check_size; 333 $self->realloc;
298} 334}
299 335
300sub size_request { 336sub size_request {
301 require Carp; 337 require Carp;
302 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
304 340
305sub configure { 341sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
307 343
308 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
311 349
312 # use alignment to adjust x, y 350 # use alignment to adjust x, y
313 351
314 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 354 }
319 355
320 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 357 $self->{x} = $x;
322 $self->{y} = $y; 358 $self->{y} = $y;
323 $self->update; 359 $self->update;
324 } 360 }
325 361
326 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 369 }
329} 370}
330 371
331sub size_allocate { 372sub size_allocate {
332 # nothing to be done 373 # nothing to be done
333} 374}
334 375
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
343} 382}
344 383
345sub set_max_size { 384sub set_max_size {
346 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
347 386
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
350} 391}
351 392
352sub set_tooltip { 393sub set_tooltip {
353 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
354 395
… …
359 400
360 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
361 402
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 406 }
366} 407}
367 408
368# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
369sub coord2local { 410sub coord2local {
… …
406 447
407 $::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
408 unless $FOCUS; 449 unless $FOCUS;
409} 450}
410 451
411sub mouse_motion { } 452sub mouse_motion { 0 }
412sub button_up { } 453sub button_up { 0 }
413sub key_down { } 454sub key_down { 0 }
414sub key_up { } 455sub key_up { 0 }
415 456
416sub button_down { 457sub button_down {
417 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
418 459
419 $self->focus_in; 460 $self->focus_in;
420}
421 461
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
426sub 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
427 538
428sub draw { 539sub draw {
429 my ($self) = @_; 540 my ($self) = @_;
430 541
431 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);
432 553
433 glPushMatrix; 554 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 556
438 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 559 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 561 glBegin GL_QUADS;
445 glVertex $x , $y; 562 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
449 glEnd; 566 glEnd;
450 glDisable GL_BLEND; 567 glDisable GL_BLEND;
451 } 568 }
452 569
453 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 571 glPushMatrix;
455 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 575 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
462 glEnd; 579 glEnd;
463 glPopMatrix; 580 glPopMatrix;
464 #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;
465 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
466} 586}
467 587
468sub _draw { 588sub _draw {
469 my ($self) = @_; 589 my ($self) = @_;
470 590
471 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
472}
473
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532} 592}
533 593
534sub DESTROY { 594sub DESTROY {
535 my ($self) = @_; 595 my ($self) = @_;
536 596
… …
568 628
569 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
571 631
572 glEnable GL_BLEND; 632 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 634 glColor_premultiply @$color;
575 635
576 glBegin GL_QUADS; 636 glBegin GL_QUADS;
577 glVertex 0 , 0; 637 glVertex 0 , 0;
578 glVertex 0 , $h; 638 glVertex 0 , $h;
579 glVertex $w, $h; 639 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
596} 656}
597 657
598sub size_request { 658sub size_request {
599 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
600} 662}
601 663
602sub draw { } 664sub draw { }
603 665
604############################################################################# 666#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
609 671
610sub new { 672sub new {
611 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
612 674
613 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
614 676
615 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
616 children => [], 678 children => [],
617 can_events => 0, 679 can_events => 0,
618 %arg, 680 %arg,
619 ); 681 );
682
620 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
621 685
622 $self 686 $self
623} 687}
624 688
625sub add { 689sub add {
… …
633 $self->{children} = [ 697 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
636 ]; 700 ];
637 701
638 $self->check_size (1); 702 $self->realloc;
639 $self->update;
640} 703}
641 704
642sub children { 705sub children {
643 @{ $_[0]{children} } 706 @{ $_[0]{children} }
644} 707}
… …
649 delete $child->{parent}; 712 delete $child->{parent};
650 $child->hide; 713 $child->hide;
651 714
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 716
654 $self->check_size (1); 717 $self->realloc;
655 $self->update;
656} 718}
657 719
658sub clear { 720sub clear {
659 my ($self) = @_; 721 my ($self) = @_;
660 722
… …
664 for (@$children) { 726 for (@$children) {
665 delete $_->{parent}; 727 delete $_->{parent};
666 $_->hide; 728 $_->hide;
667 } 729 }
668 730
669 $self->check_size; 731 $self->realloc;
670 $self->update;
671} 732}
672 733
673sub find_widget { 734sub find_widget {
674 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
675 736
676 $x -= $self->{x}; 737 $x -= $self->{x};
677 $y -= $self->{y}; 738 $y -= $self->{y};
678 739
679 my $res; 740 my $res;
680 741
681 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
683 and return $res; 744 and return $res;
684 } 745 }
685 746
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
736} 797}
737 798
738############################################################################# 799#############################################################################
739 800
801# back-buffered drawing area
802
740package CFClient::UI::Window; 803package CFClient::UI::Window;
741 804
742our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
743 806
744use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 826 $self->update;
764} 827}
765 828
766sub _render { 829sub _render {
830 my ($self) = @_;
831
767 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
768} 833}
769 834
770sub render_child { 835sub render_child {
771 my ($self) = @_; 836 my ($self) = @_;
772 837
773 $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 {
774 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
776 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
777 $self->_render; 849 $self->_render;
778 }; 850 };
779} 851}
780 852
781sub _draw { 853sub _draw {
782 my ($self) = @_; 854 my ($self) = @_;
783 855
784 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
785 857
786 my $tex = $self->{texture} 858 my $tex = $self->{texture}
787 or return; 859 or return;
788 860
789 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
792 864
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 866
795 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
796} 868}
… …
812} 884}
813 885
814sub size_request { 886sub size_request {
815 my ($self) = @_; 887 my ($self) = @_;
816 888
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 890
819 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
820} 895}
821 896
822sub size_allocate { 897sub size_allocate {
823 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
824 899
900 my $child = $self->child;
901
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 904
828 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
829 $self->update; 906 $self->update;
830} 907}
831 908
… …
867} 944}
868 945
869sub _render { 946sub _render {
870 my ($self) = @_; 947 my ($self) = @_;
871 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
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 953
874 $self->SUPER::_render; 954 $self->SUPER::_render;
875} 955}
876 956
… …
879package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
880 960
881our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
882 962
883sub new { 963sub new {
884 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
885 967
886 my $self; 968 my $self;
887 969
888 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
889 vertical => 1, 971 vertical => 1,
890 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
891 connect_changed => sub { 973 on_changed => sub {
892 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
893 }, 975 },
894 ; 976 ;
895 977
896 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 980 slider => $slider,
899 @_, 981 %arg,
900 ); 982 );
901 983
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
905 986
906 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
907} 994}
908 995
909sub update { 996sub update {
910 my ($self) = @_; 997 my ($self) = @_;
911 998
… …
950 1037
951 if ($self->{bg}) { 1038 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
953 1040
954 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
957 1044
958 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
959 glVertex 0 , 0; 1046 glVertex 0 , 0;
960 glVertex 0 , $h; 1047 glVertex 0 , $h;
961 glVertex $w, $h; 1048 glVertex $w, $h;
… …
974 1061
975our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
976 1063
977use CFClient::OpenGL; 1064use CFClient::OpenGL;
978 1065
979my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 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);
982 1073
983sub new { 1074sub new {
984 my $class = shift; 1075 my ($class, %arg) = @_;
985 1076
986 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
987 1078
988 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1082 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1083 can_events => 1,
994 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
995 ); 1087 );
996 1088
997 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
998 align => 0, 1090 align => 0,
999 valign => 1, 1091 valign => 1,
1000 text => $self->{title}, 1092 text => $title,
1001 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1002 1095
1003 $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};
1004} 1104}
1005 1105
1006sub border { 1106sub border {
1007 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1008} 1108}
1009 1109
1010sub size_request { 1110sub size_request {
1011 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1012 1115
1013 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1014 1117
1015 ( 1118 (
1016 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1019} 1122}
1020 1123
1021sub size_allocate { 1124sub size_allocate {
1022 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1023 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
1024 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1026 1137
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1031} 1139}
1032 1140
1033sub button_down { 1141sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1035 1143
… …
1051 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1052 1160
1053 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1055 1163
1056 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1057 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1058 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1059 $self->check_size; 1168 $self->realloc;
1060 }; 1169 };
1061 1170
1062 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1063 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1064 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1066 $self->{motion} = sub { 1175 $self->{motion} = sub {
1067 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1068 1177
1069 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1070 1179
1071 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1072 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1073 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1074 } 1188 1
1075} 1189}
1076 1190
1077sub button_up { 1191sub button_up {
1078 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1079 1193
1080 delete $self->{motion}; 1194 !!delete $self->{motion}
1081} 1195}
1082 1196
1083sub mouse_motion { 1197sub mouse_motion {
1084 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1085 1199
1086 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1087} 1203}
1088 1204
1089sub _draw { 1205sub _draw {
1090 my ($self) = @_; 1206 my ($self) = @_;
1091 1207
1208 my $child = $self->{children}[0];
1209
1092 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1093 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1094 1212
1095 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1096 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1097 1215
1098 my $border = $self->border; 1216 my $border = $self->border;
1099 1217
1100 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1101 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1102 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1103 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1104 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1105 1223
1106 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1107 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1108 1226
1109 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1110 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1111 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1112
1113 glColor @{ $self->{bg} };
1114
1115 $bg->{s} = $rep_x;
1116 $bg->{t} = $rep_y;
1117 $bg->{wrap_mode} = 1;
1118 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1119 } 1232 }
1120 1233
1121 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1122 1235
1123 $self->{title}->draw if $self->{title};
1124
1125 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1126} 1242}
1127 1243
1128############################################################################# 1244#############################################################################
1129 1245
1130package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1152 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1153 1269
1154 $child->set_parent ($self); 1270 $child->set_parent ($self);
1155 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1156 1272
1157 $self->check_size (1); 1273 $self->realloc;
1158} 1274}
1159 1275
1160# 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?
1161sub clear { 1277sub clear {
1162 my ($self) = @_; 1278 my ($self) = @_;
… …
1167 for (@children) { 1283 for (@children) {
1168 delete $_->{parent}; 1284 delete $_->{parent};
1169 $_->hide; 1285 $_->hide;
1170 } 1286 }
1171 1287
1172 $self->check_size (1); 1288 $self->realloc;
1173 $self->update;
1174} 1289}
1175 1290
1176sub get_wh { 1291sub get_wh {
1177 my ($self) = @_; 1292 my ($self) = @_;
1178 1293
… …
1274 } 1389 }
1275} 1390}
1276 1391
1277############################################################################# 1392#############################################################################
1278 1393
1279package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1280
1281# TODO: wrap into common Box base class
1282 1395
1283our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1284 1397
1285sub size_request { 1398sub size_request {
1286 my ($self) = @_; 1399 my ($self) = @_;
1287 1400
1288 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1289 1402 ? (
1290 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1291 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1292 (List::Util::max map $_->[1], @alloc), 1405 )
1293 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1294} 1410}
1295 1411
1296sub size_allocate { 1412sub size_allocate {
1297 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1298 1414
1299 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1300
1301 my $children = $self->{children}; 1416 my $children = $self->{children};
1302 1417
1303 my @h = map $_->{req_w}, @$children; 1418 my @req;
1304 1419
1305 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1306 1421 @req = ($space / (@$children || 1)) x @$children;
1307 if ($req_h > $h) {
1308 # ah well, not enough space
1309 $_ *= $h / $req_h for @h;
1310 } 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 {
1311 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1312 $exp ||= 1;
1313 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1314 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1315 my $child = $children->[$_];
1316
1317 my $alloc_h = $h[$_];
1318 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1319 $h[$_] = $alloc_h;
1320 } 1436 }
1321 } 1437 }
1322 1438
1323 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1324 1440
1325 my $y = 0; 1441 my $pos = 0;
1326 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1327 my $child = $children->[$_];
1328 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1329 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1330 1445
1331 $y += $h; 1446 $pos += $alloc;
1332 } 1447 }
1333 1448
1334 1 1449 1
1335} 1450}
1336 1451
1337############################################################################# 1452#############################################################################
1338 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
1339package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1340 1470
1341# TODO: wrap into common Box base class
1342
1343our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1344 1472
1345sub size_request { 1473sub new {
1346 my ($self) = @_; 1474 my $class = shift;
1347 1475
1348 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1349 1477 vertical => 1,
1350 ( 1478 @_,
1351 (List::Util::max map $_->[0], @alloc),
1352 (List::Util::sum map $_->[1], @alloc),
1353 ) 1479 )
1354}
1355
1356sub size_allocate {
1357 my ($self, $w, $h) = @_;
1358
1359 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1360
1361 my $children = $self->{children};
1362
1363 my @h = map $_->{req_h}, @$children;
1364
1365 my $req_h = List::Util::sum @h;
1366
1367 if ($req_h > $h) {
1368 # ah well, not enough space
1369 $_ *= $h / $req_h for @h;
1370 } else {
1371 my $exp = List::Util::sum map $_->{expand}, @$children;
1372 $exp ||= 1;
1373
1374 for (0 .. $#$children) {
1375 my $child = $children->[$_];
1376
1377 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1378 }
1379 }
1380
1381 CFClient::UI::harmonize \@h;
1382
1383 my $y = 0;
1384 for (0 .. $#$children) {
1385 my $child = $children->[$_];
1386 my $h = $h[$_];
1387 $child->configure (0, $y, $w, $h);
1388
1389 $y += $h;
1390 }
1391
1392 1
1393} 1480}
1394 1481
1395############################################################################# 1482#############################################################################
1396 1483
1397package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1414 ellipsise => 3, # end 1501 ellipsise => 3, # end
1415 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1416 fontsize => 1, 1503 fontsize => 1,
1417 align => -1, 1504 align => -1,
1418 valign => -1, 1505 valign => -1,
1419 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1420 can_events => 0, 1508 can_events => 0,
1421 %arg 1509 %arg
1422 ); 1510 );
1423 1511
1424 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1451 1539
1452 delete $self->{texture}; 1540 delete $self->{texture};
1453 $self->SUPER::update; 1541 $self->SUPER::update;
1454} 1542}
1455 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1456sub set_text { 1551sub set_text {
1457 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1458 1553
1459 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1460 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1461 1556
1462 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1463 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1464 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1465 $self->update; 1562 $self->update;
1466 $self->check_size;
1467} 1563}
1468 1564
1469sub set_markup { 1565sub set_markup {
1470 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1471 1567
… …
1475 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1476 1572
1477 $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;
1478 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1479 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1480 $self->update; 1578 $self->update;
1481 $self->check_size;
1482} 1579}
1483 1580
1484sub size_request { 1581sub size_request {
1485 my ($self) = @_; 1582 my ($self) = @_;
1486 1583
1584 $self->{size_req} ||= do {
1487 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1488 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1489 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1490 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1491 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1492 1590
1493 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1494 1592
1495 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1496 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1497 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1498 1596
1499 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1500 1598
1501 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1502 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1503 } 1604 };
1504 1605
1505 ( 1606 @{ $self->{size_req} }
1506 $w + $self->{padding} * 2,
1507 $h + $self->{padding} * 2,
1508 )
1509} 1607}
1510 1608
1511sub size_allocate { 1609sub size_allocate {
1512 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1513 1611
1612 delete $self->{ox};
1613
1514 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1515} 1616}
1516 1617
1517sub set_fontsize { 1618sub set_fontsize {
1518 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1519 1620
1520 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1521 delete $self->{texture}; 1622 delete $self->{texture};
1522 1623
1523 $self->update; 1624 $self->realloc;
1524 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1525} 1633}
1526 1634
1527sub _draw { 1635sub _draw {
1528 my ($self) = @_; 1636 my ($self) = @_;
1529 1637
… …
1535 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1536 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1537 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1538 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1539 1647
1540 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1541 1650
1651 unless (exists $self->{ox}) {
1542 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1543 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1544 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1545 1655
1546 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1547 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1548 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1549
1550 $tex
1551 }; 1659 };
1552 1660
1553 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1554 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};
1555 1665
1556 if ($tex->{format} == GL_ALPHA) { 1666 if ($tex->{format} == GL_ALPHA) {
1667 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1557 glColor @{$self->{fg}}; 1668 glColor @{$self->{fg}};
1558 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1559 } else { 1670 } else {
1671 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1560 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1672 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1561 } 1673 }
1562 1674
1563 glDisable GL_TEXTURE_2D; 1675 glDisable GL_TEXTURE_2D;
1564} 1676}
1565 1677
… …
1582 can_hover => 1, 1694 can_hover => 1,
1583 can_focus => 1, 1695 can_focus => 1,
1584 valign => 0, 1696 valign => 0,
1585 can_events => 1, 1697 can_events => 1,
1586 #text => ... 1698 #text => ...
1699 #hidden => "*",
1587 @_ 1700 @_
1588 ) 1701 )
1589} 1702}
1590 1703
1591sub _set_text { 1704sub _set_text {
… …
1593 1706
1594 delete $self->{cur_h}; 1707 delete $self->{cur_h};
1595 1708
1596 return if $self->{text} eq $text; 1709 return if $self->{text} eq $text;
1597 1710
1598 delete $self->{texture};
1599
1600 $self->{last_activity} = $::NOW; 1711 $self->{last_activity} = $::NOW;
1601 $self->{text} = $text; 1712 $self->{text} = $text;
1602 1713
1603 $text =~ s/./*/g if $self->{hidden}; 1714 $text =~ s/./*/g if $self->{hidden};
1604 $self->{layout}->set_text ("$text "); 1715 $self->{layout}->set_text ("$text ");
1716 delete $self->{size_req};
1605 1717
1606 $self->_emit (changed => $self->{text}); 1718 $self->_emit (changed => $self->{text});
1719
1720 $self->realloc;
1721 $self->update;
1607} 1722}
1608 1723
1609sub set_text { 1724sub set_text {
1610 my ($self, $text) = @_; 1725 my ($self, $text) = @_;
1611 1726
1612 $self->{cursor} = length $text; 1727 $self->{cursor} = length $text;
1613 $self->_set_text ($text); 1728 $self->_set_text ($text);
1614 $self->update;
1615 $self->check_size;
1616} 1729}
1617 1730
1618sub get_text { 1731sub get_text {
1619 $_[0]{text} 1732 $_[0]{text}
1620} 1733}
… …
1650 $self->{cursor} = length $text; 1763 $self->{cursor} = length $text;
1651 } elsif ($uni == 27) { 1764 } elsif ($uni == 27) {
1652 $self->_emit ('escape'); 1765 $self->_emit ('escape');
1653 } elsif ($uni) { 1766 } elsif ($uni) {
1654 substr $text, $self->{cursor}++, 0, chr $uni; 1767 substr $text, $self->{cursor}++, 0, chr $uni;
1768 } else {
1769 return 0;
1655 } 1770 }
1656 1771
1657 $self->_set_text ($text); 1772 $self->_set_text ($text);
1658 $self->update; 1773
1659 $self->check_size; 1774 $self->realloc;
1775
1776 1
1660} 1777}
1661 1778
1662sub focus_in { 1779sub focus_in {
1663 my ($self) = @_; 1780 my ($self) = @_;
1664 1781
… …
1679 utf8::encode $text; 1796 utf8::encode $text;
1680 $self->{cursor} = length substr $text, 0, $idx; 1797 $self->{cursor} = length substr $text, 0, $idx;
1681 1798
1682 $self->_set_text ($self->{text}); 1799 $self->_set_text ($self->{text});
1683 $self->update; 1800 $self->update;
1801
1802 1
1684} 1803}
1685 1804
1686sub mouse_motion { 1805sub mouse_motion {
1687 my ($self, $ev, $x, $y) = @_; 1806 my ($self, $ev, $x, $y) = @_;
1688# 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
1689} 1810}
1690 1811
1691sub _draw { 1812sub _draw {
1692 my ($self) = @_; 1813 my ($self) = @_;
1693 1814
1694 local $self->{fg} = $self->{fg}; 1815 local $self->{fg} = $self->{fg};
1695 1816
1696 if ($FOCUS == $self) { 1817 if ($FOCUS == $self) {
1697 glColor @{$self->{active_bg}}; 1818 glColor_premultiply @{$self->{active_bg}};
1698 $self->{fg} = $self->{active_fg}; 1819 $self->{fg} = $self->{active_fg};
1699 } else { 1820 } else {
1700 glColor @{$self->{bg}}; 1821 glColor_premultiply @{$self->{bg}};
1701 } 1822 }
1702 1823
1703 glEnable GL_BLEND; 1824 glEnable GL_BLEND;
1704 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1825 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1705 glBegin GL_QUADS; 1826 glBegin GL_QUADS;
1706 glVertex 0 , 0; 1827 glVertex 0 , 0;
1707 glVertex 0 , $self->{h}; 1828 glVertex 0 , $self->{h};
1708 glVertex $self->{w}, $self->{h}; 1829 glVertex $self->{w}, $self->{h};
1709 glVertex $self->{w}, 0; 1830 glVertex $self->{w}, 0;
… …
1770 } else { 1891 } else {
1771 $self->set_text ($self->{history_saveback}); 1892 $self->set_text ($self->{history_saveback});
1772 } 1893 }
1773 1894
1774 } else { 1895 } else {
1775 $self->SUPER::key_down ($ev); 1896 return $self->SUPER::key_down ($ev)
1897 }
1898
1776 } 1899 1
1777
1778} 1900}
1779 1901
1780############################################################################# 1902#############################################################################
1781 1903
1782package CFClient::UI::Button; 1904package CFClient::UI::Button;
… …
1791 1913
1792sub new { 1914sub new {
1793 my $class = shift; 1915 my $class = shift;
1794 1916
1795 $class->SUPER::new ( 1917 $class->SUPER::new (
1796 padding => 4, 1918 padding_x => 4,
1919 padding_y => 4,
1797 fg => [1, 1, 1], 1920 fg => [1, 1, 1],
1798 active_fg => [0, 0, 1], 1921 active_fg => [0, 0, 1],
1799 can_hover => 1, 1922 can_hover => 1,
1800 align => 0, 1923 align => 0,
1801 valign => 0, 1924 valign => 0,
… …
1810 my ($self, $ev, $x, $y) = @_; 1933 my ($self, $ev, $x, $y) = @_;
1811 1934
1812 $self->emit ("activate") 1935 $self->emit ("activate")
1813 if $x >= 0 && $x < $self->{w} 1936 if $x >= 0 && $x < $self->{w}
1814 && $y >= 0 && $y < $self->{h}; 1937 && $y >= 0 && $y < $self->{h};
1938
1939 1
1815} 1940}
1816 1941
1817sub _draw { 1942sub _draw {
1818 my ($self) = @_; 1943 my ($self) = @_;
1819 1944
1820 local $self->{fg} = $self->{fg}; 1945 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1821
1822 if ($GRAB == $self) {
1823 $self->{fg} = $self->{active_fg};
1824 }
1825 1946
1826 glEnable GL_TEXTURE_2D; 1947 glEnable GL_TEXTURE_2D;
1827 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1948 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1828 glColor 0, 0, 0, 1; 1949 glColor 0, 0, 0, 1;
1829 1950
… …
1848 1969
1849sub new { 1970sub new {
1850 my $class = shift; 1971 my $class = shift;
1851 1972
1852 $class->SUPER::new ( 1973 $class->SUPER::new (
1853 padding => 2, 1974 padding_x => 2,
1975 padding_y => 2,
1854 fg => [1, 1, 1], 1976 fg => [1, 1, 1],
1855 active_fg => [1, 1, 0], 1977 active_fg => [1, 1, 0],
1856 bg => [0, 0, 0, 0.2], 1978 bg => [0, 0, 0, 0.2],
1857 active_bg => [1, 1, 1, 0.5], 1979 active_bg => [1, 1, 1, 0.5],
1858 state => 0, 1980 state => 0,
… …
1862} 1984}
1863 1985
1864sub size_request { 1986sub size_request {
1865 my ($self) = @_; 1987 my ($self) = @_;
1866 1988
1867 ($self->{padding} * 2 + 6) x 2 1989 (6) x 2
1868} 1990}
1869 1991
1870sub button_down { 1992sub button_down {
1871 my ($self, $ev, $x, $y) = @_; 1993 my ($self, $ev, $x, $y) = @_;
1872 1994
1873 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1995 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1874 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1996 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1875 $self->{state} = !$self->{state}; 1997 $self->{state} = !$self->{state};
1876 $self->_emit (changed => $self->{state}); 1998 $self->_emit (changed => $self->{state});
1999 } else {
2000 return 0
2001 }
2002
1877 } 2003 1
1878} 2004}
1879 2005
1880sub _draw { 2006sub _draw {
1881 my ($self) = @_; 2007 my ($self) = @_;
1882 2008
1883 $self->SUPER::_draw; 2009 $self->SUPER::_draw;
1884 2010
1885 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2011 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1886 2012
1887 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;
1888 2016
1889 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2017 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1890 2018
1891 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2019 my $tex = $self->{state} ? $tex[1] : $tex[0];
1892 2020
… …
2047 2175
2048 my $h1 = $self->{h} * (1 - $ycut1); 2176 my $h1 = $self->{h} * (1 - $ycut1);
2049 my $h2 = $self->{h} * (1 - $ycut2); 2177 my $h2 = $self->{h} * (1 - $ycut2);
2050 2178
2051 glEnable GL_BLEND; 2179 glEnable GL_BLEND;
2052 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;
2053 glEnable GL_TEXTURE_2D; 2182 glEnable GL_TEXTURE_2D;
2054 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2183 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055 2184
2056 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2185 glBindTexture GL_TEXTURE_2D, $t1->{name};
2057 glBegin GL_QUADS; 2186 glBegin GL_QUADS;
… …
2157 fg => [1, 1, 1], 2286 fg => [1, 1, 1],
2158 active_fg => [0, 0, 0], 2287 active_fg => [0, 0, 0],
2159 bg => [0, 0, 0, 0.2], 2288 bg => [0, 0, 0, 0.2],
2160 active_bg => [1, 1, 1, 0.5], 2289 active_bg => [1, 1, 1, 0.5],
2161 range => [0, 0, 100, 10, 0], 2290 range => [0, 0, 100, 10, 0],
2162 req_w => $::WIDTH / 80, 2291 min_w => $::WIDTH / 80,
2163 req_h => $::WIDTH / 80, 2292 min_h => $::WIDTH / 80,
2164 vertical => 0, 2293 vertical => 0,
2165 can_hover => 1, 2294 can_hover => 1,
2166 inner_pad => 0.02, 2295 inner_pad => 0.02,
2167 @_ 2296 @_
2168 ); 2297 );
… …
2171 $self->update; 2300 $self->update;
2172 2301
2173 $self 2302 $self
2174} 2303}
2175 2304
2305sub changed { }
2306
2176sub set_range { 2307sub set_range {
2177 my ($self, $range) = @_; 2308 my ($self, $range) = @_;
2178 2309
2179 ($range, $self->{range}) = ($self->{range}, $range); 2310 ($range, $self->{range}) = ($self->{range}, $range);
2180 2311
… …
2206} 2337}
2207 2338
2208sub size_request { 2339sub size_request {
2209 my ($self) = @_; 2340 my ($self) = @_;
2210 2341
2211 my $w = $self->{req_w}; 2342 ($self->{req_w}, $self->{req_h})
2212 my $h = $self->{req_h};
2213
2214 $self->{vertical} ? ($h, $w) : ($w, $h)
2215} 2343}
2216 2344
2217sub button_down { 2345sub button_down {
2218 my ($self, $ev, $x, $y) = @_; 2346 my ($self, $ev, $x, $y) = @_;
2219 2347
2220 $self->SUPER::button_down ($ev, $x, $y); 2348 $self->SUPER::button_down ($ev, $x, $y);
2221 2349
2222 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2350 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2223 2351
2224 $self->mouse_motion ($ev, $x, $y); 2352 $self->mouse_motion ($ev, $x, $y)
2225} 2353}
2226 2354
2227sub mouse_motion { 2355sub mouse_motion {
2228 my ($self, $ev, $x, $y) = @_; 2356 my ($self, $ev, $x, $y) = @_;
2229 2357
… …
2233 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2361 my (undef, $lo, $hi, $page) = @{$self->{range}};
2234 2362
2235 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2363 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2236 2364
2237 $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
2238 } 2370 1
2239} 2371}
2240 2372
2241sub update { 2373sub update {
2242 my ($self) = @_; 2374 my ($self) = @_;
2243 2375
2244 $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}) {
2245 $self->set_value ($self->{range}[0]); 2384 $self->set_value ($self->{range}[0]);
2246 2385
2247 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2386 my ($value, $lo, $hi, $page) = @{$self->{range}};
2248 my $range = ($hi - $page - $lo) || 1e-100; 2387 my $range = ($hi - $page - $lo) || 1e-100;
2249 2388
… …
2255 $value = ($value - $lo) / $range; 2394 $value = ($value - $lo) / $range;
2256 $value = $value * $self->{scale} + $self->{offset}; 2395 $value = $value * $self->{scale} + $self->{offset};
2257 2396
2258 $self->{knob_x} = $value - $knob_w * 0.5; 2397 $self->{knob_x} = $value - $knob_w * 0.5;
2259 $self->{knob_w} = $knob_w; 2398 $self->{knob_w} = $knob_w;
2260 }); 2399 }
2261
2262 $self->SUPER::update;
2263}
2264
2265sub _draw {
2266 my ($self) = @_;
2267 2400
2268 $self->SUPER::_draw (); 2401 $self->SUPER::_draw ();
2269 2402
2270 glScale $self->{w}, $self->{h}; 2403 glScale $self->{w}, $self->{h};
2271 2404
… …
2344 my $class = shift; 2477 my $class = shift;
2345 2478
2346 my $self = $class->SUPER::new ( 2479 my $self = $class->SUPER::new (
2347 fontsize => 1, 2480 fontsize => 1,
2348 can_events => 0, 2481 can_events => 0,
2482 indent => 0,
2349 #font => default_font 2483 #font => default_font
2350 @_, 2484 @_,
2351 2485
2352 layout => (new CFClient::Layout 1), 2486 layout => (new CFClient::Layout 1),
2353 par => [], 2487 par => [],
… …
2376 $self->SUPER::size_allocate ($w, $h); 2510 $self->SUPER::size_allocate ($w, $h);
2377 2511
2378 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2512 $self->{layout}->set_font ($self->{font}) if $self->{font};
2379 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2513 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2380 $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});
2381 2516
2382 $self->reflow; 2517 $self->reflow;
2383} 2518}
2384 2519
2385sub text_size { 2520sub text_size {
… …
2387 2522
2388 my $layout = $self->{layout}; 2523 my $layout = $self->{layout};
2389 2524
2390 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2525 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2391 $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});
2392 $layout->set_markup ($text); 2528 $layout->set_markup ($text);
2393 2529
2394 $layout->size 2530 $layout->size
2395} 2531}
2396 2532
… …
2448 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2584 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2449 2585
2450 for (@{$self->{par}}) { 2586 for (@{$self->{par}}) {
2451 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2587 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2452 $layout->set_width ($W - $_->[3]); 2588 $layout->set_width ($W - $_->[3]);
2589 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2453 $layout->set_markup ($_->[4]); 2590 $layout->set_markup ($_->[4]);
2454 my ($w, $h) = $layout->size; 2591 my ($w, $h) = $layout->size;
2455 $_->[0] = $w + $_->[3]; 2592 $_->[0] = $w + $_->[3];
2456 $_->[1] = $h; 2593 $_->[1] = $h;
2457 } 2594 }
… …
2465 2602
2466 delete $self->{texture}; 2603 delete $self->{texture};
2467 } 2604 }
2468 2605
2469 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2606 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2470 glClearColor 0.5, 0.5, 0.5, 0; 2607 glClearColor 0, 0, 0, 0;
2471 glClear GL_COLOR_BUFFER_BIT; 2608 glClear GL_COLOR_BUFFER_BIT;
2472 2609
2473 my $top = int $self->{children}[1]{range}[0]; 2610 my $top = int $self->{children}[1]{range}[0];
2474 2611
2475 my $y0 = $top; 2612 my $y0 = $top;
… …
2489 my $h = $par->[1]; 2626 my $h = $par->[1];
2490 2627
2491 if ($y0 < $y + $h && $y < $y1) { 2628 if ($y0 < $y + $h && $y < $y1) {
2492 $layout->set_foreground (@{ $par->[2] }); 2629 $layout->set_foreground (@{ $par->[2] });
2493 $layout->set_width ($W - $par->[3]); 2630 $layout->set_width ($W - $par->[3]);
2631 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2494 $layout->set_markup ($par->[4]); 2632 $layout->set_markup ($par->[4]);
2495 2633
2496 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2634 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2497 2635
2498 glRasterPos $par->[3], $y - $y0; 2636 glRasterPos $par->[3], $y - $y0;
… …
2510sub _draw { 2648sub _draw {
2511 my ($self) = @_; 2649 my ($self) = @_;
2512 2650
2513 glEnable GL_TEXTURE_2D; 2651 glEnable GL_TEXTURE_2D;
2514 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515 glColor 1, 1, 1, 1; 2653 glColor 0, 0, 0, 1;
2516 $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});
2517 glDisable GL_TEXTURE_2D; 2655 glDisable GL_TEXTURE_2D;
2518 2656
2519 $self->{children}[1]->draw; 2657 $self->{children}[1]->draw;
2520 2658
2521} 2659}
… …
2570 2708
2571sub new { 2709sub new {
2572 my $class = shift; 2710 my $class = shift;
2573 2711
2574 my $self = $class->SUPER::new ( 2712 my $self = $class->SUPER::new (
2575 state => 0, 2713 state => 0,
2576 connect_activate => \&toggle_flopper, 2714 on_activate => \&toggle_flopper,
2577 @_ 2715 @_
2578 ); 2716 );
2579 2717
2580 if ($self->{state}) {
2581 $self->{state} = 0;
2582 $self->toggle_flopper;
2583 }
2584
2585 $self 2718 $self
2586} 2719}
2587 2720
2588sub toggle_flopper { 2721sub toggle_flopper {
2589 my ($self) = @_; 2722 my ($self) = @_;
2590 2723
2591 # TODO: use animation 2724 $self->{other}->toggle_visibility;
2592 if ($self->{state} = !$self->{state}) {
2593 $CFClient::UI::ROOT->add ($self->{other});
2594 $self->{other}->move ($self->coord2global (0, $self->{h}));
2595 $self->_emit ("open");
2596 } else {
2597 $CFClient::UI::ROOT->remove ($self->{other});
2598 $self->_emit ("close");
2599 }
2600
2601 $self->_emit (changed => $self->{state});
2602} 2725}
2603 2726
2604############################################################################# 2727#############################################################################
2605 2728
2606package CFClient::UI::Tooltip; 2729package CFClient::UI::Tooltip;
… …
2619} 2742}
2620 2743
2621sub set_tooltip_from { 2744sub set_tooltip_from {
2622 my ($self, $widget) = @_; 2745 my ($self, $widget) = @_;
2623 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
2624 $self->add (new CFClient::UI::Label 2756 $self->add (new CFClient::UI::Label
2625 markup => $widget->{tooltip}, 2757 markup => $tooltip,
2626 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2758 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2627 fontsize => 0.8, 2759 fontsize => 0.8,
2628 fg => [0, 0, 0, 1], 2760 fg => [0, 0, 0, 1],
2629 ellipsise => 0, 2761 ellipsise => 0,
2630 font => ($widget->{tooltip_font} || $::FONT_PROP), 2762 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2641 2773
2642sub size_allocate { 2774sub size_allocate {
2643 my ($self, $w, $h) = @_; 2775 my ($self, $w, $h) = @_;
2644 2776
2645 $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 });
2646} 2796}
2647 2797
2648sub _draw { 2798sub _draw {
2649 my ($self) = @_; 2799 my ($self) = @_;
2650 2800
… …
2667 glVertex $w, $h; 2817 glVertex $w, $h;
2668 glVertex $w, 0; 2818 glVertex $w, 0;
2669 glEnd; 2819 glEnd;
2670 2820
2671 glTranslate 2 - 0.375, 2 - 0.375; 2821 glTranslate 2 - 0.375, 2 - 0.375;
2822
2672 $self->SUPER::_draw; 2823 $self->SUPER::_draw;
2673} 2824}
2674 2825
2675############################################################################# 2826#############################################################################
2676 2827
… …
2735 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2886 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2736 2887
2737 if ($tex) { 2888 if ($tex) {
2738 glEnable GL_TEXTURE_2D; 2889 glEnable GL_TEXTURE_2D;
2739 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2890 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2740 glColor 1, 1, 1, 1; 2891 glColor 0, 0, 0, 1;
2741 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2892 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2742 glDisable GL_TEXTURE_2D; 2893 glDisable GL_TEXTURE_2D;
2743 } 2894 }
2744} 2895}
2745 2896
… …
2752 $self->SUPER::DESTROY; 2903 $self->SUPER::DESTROY;
2753} 2904}
2754 2905
2755############################################################################# 2906#############################################################################
2756 2907
2757package CFClient::UI::Inventory; 2908package CFClient::UI::Buttonbar;
2758 2909
2759our @ISA = CFClient::UI::ScrolledWindow::; 2910our @ISA = CFClient::UI::HBox::;
2760 2911
2761sub new { 2912# TODO: should actualyl wrap buttons and other goodies.
2762 my $class = shift;
2763
2764 my $self = $class->SUPER::new (
2765 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2766 @_,
2767 );
2768
2769 $self
2770}
2771
2772sub set_items {
2773 my ($self, $items) = @_;
2774
2775 $self->{scrolled}->clear;
2776 return unless $items;
2777
2778 my @items = sort {
2779 ($a->{type} <=> $b->{type})
2780 or ($a->{name} cmp $b->{name})
2781 } @$items;
2782
2783 $self->{real_items} = \@items;
2784
2785 my $row = 0;
2786 for my $item (@items) {
2787 CFClient::Item::update_widgets $item;
2788
2789 $self->{scrolled}->add (0, $row, $item->{face_widget});
2790 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2791 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2792
2793 $row++;
2794 }
2795}
2796
2797sub size_request {
2798 my ($self) = @_;
2799 ($self->{req_w}, $self->{req_h});
2800}
2801 2913
2802############################################################################# 2914#############################################################################
2803 2915
2804package CFClient::UI::Menu; 2916package CFClient::UI::Menu;
2805 2917
… …
2817 ); 2929 );
2818 2930
2819 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2931 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2820 2932
2821 for my $item (@{ $self->{items} }) { 2933 for my $item (@{ $self->{items} }) {
2822 my ($widget, $cb) = @$item; 2934 my ($widget, $cb, $tooltip) = @$item;
2823 2935
2824 # handle various types of items, only text for now 2936 # handle various types of items, only text for now
2825 if (!ref $widget) { 2937 if (!ref $widget) {
2826 $widget = new CFClient::UI::Label 2938 $widget = new CFClient::UI::Label
2827 can_hover => 1, 2939 can_hover => 1,
2828 can_events => 1, 2940 can_events => 1,
2829 text => $widget; 2941 text => $widget,
2942 tooltip => $tooltip
2830 } 2943 }
2831 2944
2832 $self->{item}{$widget} = $item; 2945 $self->{item}{$widget} = $item;
2833 2946
2834 $self->{vbox}->add ($widget); 2947 $self->{vbox}->add ($widget);
… …
2846 # maybe save $GRAB? must be careful about events... 2959 # maybe save $GRAB? must be careful about events...
2847 $GRAB = $self; 2960 $GRAB = $self;
2848 $self->{button} = $ev->{button}; 2961 $self->{button} = $ev->{button};
2849 2962
2850 $self->show; 2963 $self->show;
2851 $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);
2852} 2965}
2853 2966
2854sub mouse_motion { 2967sub mouse_motion {
2855 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2856 2969
2857 # TODO: should use vbox->find_widget or so 2970 # TODO: should use vbox->find_widget or so
2858 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2971 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2859 $self->{hover} = $self->{item}{$HOVER}; 2972 $self->{hover} = $self->{item}{$HOVER};
2973
2974 0
2860} 2975}
2861 2976
2862sub button_up { 2977sub button_up {
2863 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2864 2979
… …
2866 undef $GRAB; 2981 undef $GRAB;
2867 $self->hide; 2982 $self->hide;
2868 2983
2869 $self->_emit ("popdown"); 2984 $self->_emit ("popdown");
2870 $self->{hover}[1]->() if $self->{hover}; 2985 $self->{hover}[1]->() if $self->{hover};
2986 } else {
2987 return 0
2988 }
2989
2871 } 2990 1
2872} 2991}
2873 2992
2874############################################################################# 2993#############################################################################
2875 2994
2876package CFClient::UI::Statusbox; 2995package CFClient::UI::Multiplexer;
2877 2996
2878our @ISA = CFClient::UI::VBox::; 2997our @ISA = CFClient::UI::Container::;
2879 2998
2880sub new { 2999sub new {
2881 my $class = shift; 3000 my $class = shift;
2882 3001
2883 $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 (
2884 fontsize => 0.8, 3167 fontsize => 0.8,
2885 @_, 3168 @_,
2886 ) 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
2887} 3176}
2888 3177
2889sub reorder { 3178sub reorder {
2890 my ($self) = @_; 3179 my ($self) = @_;
2891 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} };
2892 3186
2893 while (my ($k, $v) = each %{ $self->{item} }) { 3187 while (my ($k, $v) = each %{ $self->{item} }) {
2894 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3188 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2895 } 3189 }
2896 3190
… …
2899 my @items = sort { 3193 my @items = sort {
2900 $a->{pri} <=> $b->{pri} 3194 $a->{pri} <=> $b->{pri}
2901 or $b->{id} <=> $a->{id} 3195 or $b->{id} <=> $a->{id}
2902 } values %{ $self->{item} }; 3196 } values %{ $self->{item} };
2903 3197
3198 $self->{timer}->interval (1);
3199
2904 my $count = 10 + 1; 3200 my $count = 10 + 1;
2905 for my $item (@items) { 3201 for my $item (@items) {
2906 last unless --$count; 3202 last unless --$count;
2907 3203
2908 push @widgets, $item->{label} ||= do { 3204 my $label = $item->{label} ||= do {
2909 # TODO: doesn't handle markup well (read as: at all) 3205 # TODO: doesn't handle markup well (read as: at all)
2910 my $short = $item->{count} > 1 3206 my $short = $item->{count} > 1
2911 ? "<b>$item->{count} ×</b> $item->{text}" 3207 ? "<b>$item->{count} ×</b> $item->{text}"
2912 : $item->{text}; 3208 : $item->{text};
2913 3209
… …
2921 tooltip => $item->{tooltip}, 3217 tooltip => $item->{tooltip},
2922 tooltip_font => $::FONT_PROP, 3218 tooltip_font => $::FONT_PROP,
2923 tooltip_width => 0.67, 3219 tooltip_width => 0.67,
2924 fontsize => $item->{fontsize} || $self->{fontsize}, 3220 fontsize => $item->{fontsize} || $self->{fontsize},
2925 max_w => $::WIDTH * 0.44, 3221 max_w => $::WIDTH * 0.44,
2926 fg => $item->{fg}, 3222 fg => [@{ $item->{fg} }],
2927 can_events => 1, 3223 can_events => 1,
2928 can_hover => 1 3224 can_hover => 1
2929 }; 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;
2930 } 3238 }
2931 3239
2932 $self->clear; 3240 $self->clear;
2933 $self->SUPER::add (reverse @widgets); 3241 $self->SUPER::add (reverse @widgets);
2934} 3242}
… …
2939 $text =~ s/^\s+//; 3247 $text =~ s/^\s+//;
2940 $text =~ s/\s+$//; 3248 $text =~ s/\s+$//;
2941 3249
2942 return unless $text; 3250 return unless $text;
2943 3251
2944 my $timeout = time + ((delete $arg{timeout}) || 60); 3252 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2945 3253
2946 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3254 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2947 3255
2948 if (my $item = $self->{item}{$group}) { 3256 if (my $item = $self->{item}{$group}) {
2949 if ($item->{text} eq $text) { 3257 if ($item->{text} eq $text) {
… …
2979 3287
2980 $self->reorder; 3288 $self->reorder;
2981 $self->SUPER::reconfigure; 3289 $self->SUPER::reconfigure;
2982} 3290}
2983 3291
3292sub DESTROY {
3293 my ($self) = @_;
3294
3295 $self->{timer}->cancel;
3296
3297 $self->SUPER::DESTROY;
3298}
3299
2984############################################################################# 3300#############################################################################
2985 3301
2986package CFClient::UI::Root; 3302package CFClient::UI::Inventory;
2987 3303
2988our @ISA = CFClient::UI::Container::; 3304our @ISA = CFClient::UI::ScrolledWindow::;
2989
2990use CFClient::OpenGL;
2991 3305
2992sub new { 3306sub new {
2993 my $class = shift; 3307 my $class = shift;
2994 3308
2995 $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 => [],
3551 @_,
3552 )
3553}
3554
3555my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
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.");
3561
3562sub rebuild_spell_list {
3563 my ($self) = @_;
3564
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 {
3610 my ($self, $spell) = @_;
3611
3612 $self->{spell}->{$spell->{name}} = $spell;
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 (
2996 visible => 1, 3637 visible => 1,
2997 @_, 3638 @_,
2998 ) 3639 );
2999}
3000 3640
3001sub configure { 3641 Scalar::Util::weaken ($self->{root} = $self);
3002 my ($self, $x, $y, $w, $h) = @_;
3003 3642
3004 $self->{w} = $w; 3643 $self
3005 $self->{h} = $h;
3006}
3007
3008sub check_size {
3009 my ($self) = @_;
3010
3011 $self->size_allocate ($self->{w}, $self->{h})
3012 if $self->{w};
3013} 3644}
3014 3645
3015sub size_request { 3646sub size_request {
3016 my ($self) = @_; 3647 my ($self) = @_;
3017 3648
3018 ($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
3019} 3664}
3020 3665
3021sub size_allocate { 3666sub size_allocate {
3022 my ($self, $w, $h) = @_; 3667 my ($self, $w, $h) = @_;
3023 3668
3024 for my $child ($self->children) { 3669 for my $child ($self->children) {
3025 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)};
3026 3671
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3672 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3673 $Y = $child->{force_y} if exists $child->{force_y};
3029 3674
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3675 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3676 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3034 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3035 3677
3036 $child->configure ($X, $Y, $W, $H); 3678 $child->configure ($X, $Y, $W, $H);
3037 } 3679 }
3038} 3680}
3039 3681
… …
3050} 3692}
3051 3693
3052sub update { 3694sub update {
3053 my ($self) = @_; 3695 my ($self) = @_;
3054 3696
3055 $self->check_size;
3056 $::WANT_REFRESH++; 3697 $::WANT_REFRESH++;
3057} 3698}
3058 3699
3059sub add { 3700sub add {
3060 my ($self, @children) = @_; 3701 my ($self, @children) = @_;
3061 3702
3062 for (my @widgets = @children; my $w = pop @widgets; ) {
3063 push @widgets, $w->children;
3064 $w->{root} = $self;
3065 $w->{visible} = $self->{visible} + 1;
3066 }
3067
3068 for my $child (@children) {
3069 $child->{is_toplevel} = 1; 3703 $_->{is_toplevel} = 1
3070 3704 for @children;
3071 # integerise window positions
3072 $child->{x} = int $child->{x};
3073 $child->{y} = int $child->{y};
3074 }
3075 3705
3076 $self->SUPER::add (@children); 3706 $self->SUPER::add (@children);
3077} 3707}
3078 3708
3079sub remove { 3709sub remove {
3080 my ($self, @children) = @_; 3710 my ($self, @children) = @_;
3081 3711
3082 $self->SUPER::remove (@children); 3712 $self->SUPER::remove (@children);
3713
3714 delete $self->{is_toplevel}
3715 for @children;
3083 3716
3084 while (@children) { 3717 while (@children) {
3085 my $w = pop @children; 3718 my $w = pop @children;
3086 push @children, $w->children; 3719 push @children, $w->children;
3087 $w->set_invisible; 3720 $w->set_invisible;
… …
3106 while ($self->{refresh_hook}) { 3739 while ($self->{refresh_hook}) {
3107 $_->() 3740 $_->()
3108 for values %{delete $self->{refresh_hook}}; 3741 for values %{delete $self->{refresh_hook}};
3109 } 3742 }
3110 3743
3111 if ($self->{check_size}) { 3744 if ($self->{realloc}) {
3112 my @queue = ([], []); 3745 my %queue;
3746 my @queue;
3747 my $widget;
3113 3748
3114 for (;;) { 3749 outer:
3115 if ($self->{check_size}) { 3750 while () {
3116 # heuristic: check containers last 3751 if (my $realloc = delete $self->{realloc}) {
3117 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3752 for $widget (values %$realloc) {
3118 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 }
3119 } 3759 }
3120 3760
3121 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3761 while () {
3762 @queue or last outer;
3122 3763
3123 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3764 $widget = pop @{ $queue[-1] || [] }
3124 ? @$widget{qw(user_w user_h)} 3765 and last;
3125 : $widget->size_request;
3126
3127 if (delete $widget->{force_alloc}
3128 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3129 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3130 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}) {
3131 $widget->{req_w} = $w; 3785 $widget->{req_w} = $w;
3132 $widget->{req_h} = $h; 3786 $widget->{req_h} = $h;
3133 3787
3134 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3788 $self->{size_alloc}{$widget+0} = $widget;
3135 3789
3136 $widget->{parent}->check_size
3137 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 }
3138 } 3797 }
3798
3799 delete $self->{realloc}{$widget+0};
3139 } 3800 }
3140 } 3801 }
3141 3802
3142 while ($self->{size_alloc}) { 3803 while (my $size_alloc = delete $self->{size_alloc}) {
3143 for (values %{delete $self->{size_alloc}}) { 3804 my @queue = sort { $b->{visible} <=> $a->{visible} }
3144 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)};
3145 3811
3146 $w = 0 if $w < 0; 3812 $w = 0 if $w < 0;
3147 $h = 0 if $h < 0; 3813 $h = 0 if $h < 0;
3148 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
3149 $widget->{w} = $w; 3822 $widget->{w} = $w;
3150 $widget->{h} = $h; 3823 $widget->{h} = $h;
3824
3151 $widget->emit (size_allocate => $w, $h); 3825 $widget->emit (size_allocate => $w, $h);
3826 }
3152 } 3827 }
3153 } 3828 }
3154 3829
3155 while ($self->{post_alloc_hook}) { 3830 while ($self->{post_alloc_hook}) {
3156 $_->() 3831 $_->()
3157 for values %{delete $self->{post_alloc_hook}}; 3832 for values %{delete $self->{post_alloc_hook}};
3158 } 3833 }
3834
3159 3835
3160 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3836 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3161 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3837 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3162 glClear GL_COLOR_BUFFER_BIT; 3838 glClear GL_COLOR_BUFFER_BIT;
3163 3839
… …
3165 glLoadIdentity; 3841 glLoadIdentity;
3166 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3842 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3167 glMatrixMode GL_MODELVIEW; 3843 glMatrixMode GL_MODELVIEW;
3168 glLoadIdentity; 3844 glLoadIdentity;
3169 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
3170 $self->_draw; 3853 $self->_draw;
3171} 3854}
3172 3855
3173############################################################################# 3856#############################################################################
3174 3857

Diff Legend

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