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.234 by root, Thu May 25 16:24:44 2006 UTC vs.
Revision 1.292 by root, Tue Jun 6 03:02:15 2006 UTC

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

Diff Legend

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