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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.302 by root, Mon Jun 12 13:26:14 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};
274
275 $_->set_invisible for $self->children;
232 276
233 delete $self->{visible}; 277 delete $self->{visible};
278 delete $self->{root};
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, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, 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} 592}
445 593
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 $self->{root} = $parent->{root};
464 $self->{visible} = $parent->{visible};
465
466 # TODO: req_w _does_change after ->reconfigure
467 $self->check_size
468 unless exists $self->{req_w};
469
470 $self->show;
471}
472
473sub check_size {
474 my ($self, $forced) = @_;
475
476 $self->{force_alloc} = 1 if $forced;
477 $CFClient::UI::ROOT->{check_size}{$self} = $self;
478}
479
480sub update {
481 my ($self) = @_;
482
483 $self->{parent}->update
484 if $self->{parent};
485}
486
487sub connect {
488 my ($self, $signal, $cb) = @_;
489
490 push @{ $self->{signal_cb}{$signal} }, $cb;
491}
492
493sub _emit {
494 my ($self, $signal, @args) = @_;
495
496 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
497}
498
499sub emit {
500 my ($self, $signal, @args) = @_;
501
502 $self->_emit ($signal, @args)
503 || $self->$signal (@args);
504}
505
506sub DESTROY { 594sub DESTROY {
507 my ($self) = @_; 595 my ($self) = @_;
508 596
509 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
510 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
511} 601}
512 602
513############################################################################# 603#############################################################################
514 604
515package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
540 630
541 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
543 633
544 glEnable GL_BLEND; 634 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 636 glColor_premultiply @$color;
547 637
548 glBegin GL_QUADS; 638 glBegin GL_QUADS;
549 glVertex 0 , 0; 639 glVertex 0 , 0;
550 glVertex 0 , $h; 640 glVertex 0 , $h;
551 glVertex $w, $h; 641 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
568} 658}
569 659
570sub size_request { 660sub size_request {
571 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
572} 664}
573 665
574sub draw { } 666sub draw { }
575 667
576############################################################################# 668#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
581 673
582sub new { 674sub new {
583 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
584 676
585 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
586 678
587 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
588 children => [], 680 children => [],
589 can_events => 0, 681 can_events => 0,
590 %arg, 682 %arg,
591 ); 683 );
684
592 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
593 687
594 $self 688 $self
595} 689}
596 690
597sub add { 691sub add {
… …
605 $self->{children} = [ 699 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
608 ]; 702 ];
609 703
610 $self->check_size (1); 704 $self->realloc;
611 $self->update;
612} 705}
613 706
614sub children { 707sub children {
615 @{ $_[0]{children} } 708 @{ $_[0]{children} }
616} 709}
… …
621 delete $child->{parent}; 714 delete $child->{parent};
622 $child->hide; 715 $child->hide;
623 716
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 718
626 $self->check_size (1); 719 $self->realloc;
627 $self->update;
628} 720}
629 721
630sub clear { 722sub clear {
631 my ($self) = @_; 723 my ($self) = @_;
632 724
… …
636 for (@$children) { 728 for (@$children) {
637 delete $_->{parent}; 729 delete $_->{parent};
638 $_->hide; 730 $_->hide;
639 } 731 }
640 732
641 $self->check_size; 733 $self->realloc;
642 $self->update;
643} 734}
644 735
645sub find_widget { 736sub find_widget {
646 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
647 738
648 $x -= $self->{x}; 739 $x -= $self->{x};
649 $y -= $self->{y}; 740 $y -= $self->{y};
650 741
651 my $res; 742 my $res;
652 743
653 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
655 and return $res; 746 and return $res;
656 } 747 }
657 748
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
679} 770}
680 771
681sub add { 772sub add {
682 my ($self, $child) = @_; 773 my ($self, $child) = @_;
683 774
684 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
685
686 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
687} 777}
688 778
689sub remove { 779sub remove {
690 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
708} 798}
709 799
710############################################################################# 800#############################################################################
711 801
802# back-buffered drawing area
803
712package CFClient::UI::Window; 804package CFClient::UI::Window;
713 805
714our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
715 807
716use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 827 $self->update;
736} 828}
737 829
738sub _render { 830sub _render {
831 my ($self) = @_;
832
739 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
740} 834}
741 835
742sub render_child { 836sub render_child {
743 my ($self) = @_; 837 my ($self) = @_;
744 838
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
748 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
749 $self->_render; 850 $self->_render;
750 }; 851 };
751} 852}
752 853
753sub _draw { 854sub _draw {
754 my ($self) = @_; 855 my ($self) = @_;
755 856
756 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
757 858
758 my $tex = $self->{texture} 859 my $tex = $self->{texture}
759 or return; 860 or return;
760 861
761 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
764 865
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 867
767 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
768} 869}
… …
784} 885}
785 886
786sub size_request { 887sub size_request {
787 my ($self) = @_; 888 my ($self) = @_;
788 889
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 891
791 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
792} 896}
793 897
794sub size_allocate { 898sub size_allocate {
795 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
796 900
901 my $child = $self->child;
902
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 905
800 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
801 $self->update; 907 $self->update;
802} 908}
803 909
… …
839} 945}
840 946
841sub _render { 947sub _render {
842 my ($self) = @_; 948 my ($self) = @_;
843 949
950 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
951 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
952
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 954
846 $self->SUPER::_render; 955 $self->SUPER::_render;
847} 956}
848 957
… …
851package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
852 961
853our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
854 963
855sub new { 964sub new {
856 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
857 968
858 my $self; 969 my $self;
859 970
860 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
861 vertical => 1, 972 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 974 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
865 }, 976 },
866 ; 977 ;
867 978
868 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 981 slider => $slider,
871 @_, 982 %arg,
872 ); 983 );
873 984
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
877 987
878 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
879} 995}
880 996
881sub update { 997sub update {
882 my ($self) = @_; 998 my ($self) = @_;
883 999
… …
922 1038
923 if ($self->{bg}) { 1039 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
925 1041
926 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
929 1045
930 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
931 glVertex 0 , 0; 1047 glVertex 0 , 0;
932 glVertex 0 , $h; 1048 glVertex 0 , $h;
933 glVertex $w, $h; 1049 glVertex $w, $h;
… …
946 1062
947our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
948 1064
949use CFClient::OpenGL; 1065use CFClient::OpenGL;
950 1066
951my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1073 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1074
955sub new { 1075sub new {
956 my $class = shift; 1076 my ($class, %arg) = @_;
957
958 # TODO: user_x, user_y, overwrite moveto?
959 1077
960 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1081 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1082 can_events => 1,
966 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
967 ); 1086 );
968 1087
969 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
970 align => 0, 1089 align => 0,
971 valign => 1, 1090 valign => 1,
972 text => $self->{title}, 1091 text => $self->{title},
973 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
974 1094
975 $self 1095 $self
1096}
1097
1098sub add {
1099 my ($self, @widgets) = @_;
1100
1101 $self->SUPER::add (@widgets);
1102 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
976} 1103}
977 1104
978sub border { 1105sub border {
979 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
980} 1107}
981 1108
982sub size_request { 1109sub size_request {
983 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
984 1114
985 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
986 1116
987 ( 1117 (
988 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
991} 1121}
992 1122
993sub size_allocate { 1123sub size_allocate {
994 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
995 1125
1126 if ($self->{title_widget}) {
1127 $self->{title_widget}{w} = $w;
1128 $self->{title_widget}{h} = $h;
1129 $self->{title_widget}->size_allocate ($w, $h);
1130 }
1131
1132 my $border = $self->border;
1133
996 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
998 1136
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1003} 1138}
1004 1139
1005sub button_down { 1140sub button_down {
1006 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1007 1142
… …
1023 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1024 1159
1025 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1027 1162
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1167 $self->realloc;
1032 }; 1168 };
1033 1169
1034 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1174 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1040 1176
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1178
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1046 } 1187 1
1047} 1188}
1048 1189
1049sub button_up { 1190sub button_up {
1050 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1051 1192
1052 delete $self->{motion}; 1193 !!delete $self->{motion}
1053} 1194}
1054 1195
1055sub mouse_motion { 1196sub mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1057 1198
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1059} 1202}
1060 1203
1061sub _draw { 1204sub _draw {
1062 my ($self) = @_; 1205 my ($self) = @_;
1063 1206
1207 my $child = $self->{children}[0];
1208
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1211
1067 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1214
1070 my $border = $self->border; 1215 my $border = $self->border;
1071 1216
1072 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1222
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1080 1225
1081 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1231 }
1092 1232
1093 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1094 1234
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1098} 1241}
1099 1242
1100############################################################################# 1243#############################################################################
1101 1244
1102package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1125 1268
1126 $child->set_parent ($self); 1269 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1128 1271
1129 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1130} 1279}
1131 1280
1132# TODO: move to container class maybe? send children a signal on removal? 1281# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1282sub clear {
1134 my ($self) = @_; 1283 my ($self) = @_;
… …
1139 for (@children) { 1288 for (@children) {
1140 delete $_->{parent}; 1289 delete $_->{parent};
1141 $_->hide; 1290 $_->hide;
1142 } 1291 }
1143 1292
1144 $self->check_size (1); 1293 $self->realloc;
1145 $self->update;
1146} 1294}
1147 1295
1148sub get_wh { 1296sub get_wh {
1149 my ($self) = @_; 1297 my ($self) = @_;
1150 1298
… …
1246 } 1394 }
1247} 1395}
1248 1396
1249############################################################################# 1397#############################################################################
1250 1398
1251package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1400
1255our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1256 1402
1257sub size_request { 1403sub size_request {
1258 my ($self) = @_; 1404 my ($self) = @_;
1259 1405
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1261 1407 ? (
1262 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1410 )
1265 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1266} 1415}
1267 1416
1268sub size_allocate { 1417sub size_allocate {
1269 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1270 1419
1271 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1421 my $children = $self->{children};
1274 1422
1275 my @h = map $_->{req_w}, @$children; 1423 my @req;
1276 1424
1277 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1278 1426 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else { 1427 } else {
1428 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1429 my $req = List::Util::sum @req;
1430
1431 if ($req > $space) {
1432 # ah well, not enough space
1433 $_ *= $space / $req for @req;
1434 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1441 }
1293 } 1442 }
1294 1443
1295 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1296 1445
1297 my $y = 0; 1446 my $pos = 0;
1298 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1450
1303 $y += $h; 1451 $pos += $alloc;
1304 } 1452 }
1305 1453
1306 1 1454 1
1307} 1455}
1308 1456
1309############################################################################# 1457#############################################################################
1310 1458
1459package CFClient::UI::HBox;
1460
1461our @ISA = CFClient::UI::Box::;
1462
1463sub new {
1464 my $class = shift;
1465
1466 $class->SUPER::new (
1467 vertical => 0,
1468 @_,
1469 )
1470}
1471
1472#############################################################################
1473
1311package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1312 1475
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1316 1477
1317sub size_request { 1478sub new {
1318 my ($self) = @_; 1479 my $class = shift;
1319 1480
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1321 1482 vertical => 1,
1322 ( 1483 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1484 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1485}
1366 1486
1367############################################################################# 1487#############################################################################
1368 1488
1369package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1506 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1388 fontsize => 1, 1508 fontsize => 1,
1389 align => -1, 1509 align => -1,
1390 valign => -1, 1510 valign => -1,
1391 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1392 can_events => 0, 1513 can_events => 0,
1393 %arg 1514 %arg
1394 ); 1515 );
1395 1516
1396 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1423 1544
1424 delete $self->{texture}; 1545 delete $self->{texture};
1425 $self->SUPER::update; 1546 $self->SUPER::update;
1426} 1547}
1427 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1428sub set_text { 1556sub set_text {
1429 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1430 1558
1431 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1432 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1433 1561
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1436 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1437 $self->update; 1567 $self->update;
1438 $self->check_size;
1439} 1568}
1440 1569
1441sub set_markup { 1570sub set_markup {
1442 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1443 1572
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1577
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1578 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1451 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1452 $self->update; 1583 $self->update;
1453 $self->check_size;
1454} 1584}
1455 1585
1456sub size_request { 1586sub size_request {
1457 my ($self) = @_; 1587 my ($self) = @_;
1458 1588
1589 $self->{size_req} ||= do {
1459 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1460 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1464 1595
1465 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1466 1597
1467 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1468 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1469 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1470 1601
1471 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1472 1603
1473 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1475 } 1609 };
1476 1610
1477 ( 1611 @{ $self->{size_req} }
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1612}
1482 1613
1483sub size_allocate { 1614sub size_allocate {
1484 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1485 1616
1617 delete $self->{ox};
1618
1486 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487} 1621}
1488 1622
1489sub set_fontsize { 1623sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1491 1625
1492 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1627 delete $self->{texture};
1494 1628
1495 $self->update; 1629 $self->realloc;
1496 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1497} 1638}
1498 1639
1499sub _draw { 1640sub _draw {
1500 my ($self) = @_; 1641 my ($self) = @_;
1501 1642
… …
1507 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1652
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1513 1655
1656 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1517 1660
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1664 };
1524 1665
1525 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1667
1668 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1669 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1527 1670
1528 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1529 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1531 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1533 } 1678 }
1534 1679
1535 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1536} 1681}
1537 1682
… …
1554 can_hover => 1, 1699 can_hover => 1,
1555 can_focus => 1, 1700 can_focus => 1,
1556 valign => 0, 1701 valign => 0,
1557 can_events => 1, 1702 can_events => 1,
1558 #text => ... 1703 #text => ...
1704 #hidden => "*",
1559 @_ 1705 @_
1560 ) 1706 )
1561} 1707}
1562 1708
1563sub _set_text { 1709sub _set_text {
… …
1565 1711
1566 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1567 1713
1568 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1569 1715
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1717 $self->{text} = $text;
1574 1718
1575 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1577 1722
1578 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1579} 1727}
1580 1728
1581sub set_text { 1729sub set_text {
1582 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1583 1731
1584 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1733 $self->_set_text ($text);
1586 $self->update;
1587 $self->check_size;
1588} 1734}
1589 1735
1590sub get_text { 1736sub get_text {
1591 $_[0]{text} 1737 $_[0]{text}
1592} 1738}
… …
1622 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1625 } elsif ($uni) { 1771 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1627 } 1775 }
1628 1776
1629 $self->_set_text ($text); 1777 $self->_set_text ($text);
1630 $self->update; 1778
1631 $self->check_size; 1779 $self->realloc;
1780
1781 1
1632} 1782}
1633 1783
1634sub focus_in { 1784sub focus_in {
1635 my ($self) = @_; 1785 my ($self) = @_;
1636 1786
… …
1651 utf8::encode $text; 1801 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1653 1803
1654 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1655 $self->update; 1805 $self->update;
1806
1807 1
1656} 1808}
1657 1809
1658sub mouse_motion { 1810sub mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1812# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1813
1814 0
1661} 1815}
1662 1816
1663sub _draw { 1817sub _draw {
1664 my ($self) = @_; 1818 my ($self) = @_;
1665 1819
1666 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1667 1821
1668 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1671 } else { 1825 } else {
1672 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1673 } 1827 }
1674 1828
1675 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1832 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1742 } else { 1896 } else {
1743 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1744 } 1898 }
1745 1899
1746 } else { 1900 } else {
1747 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1748 } 1904 1
1749
1750} 1905}
1751 1906
1752############################################################################# 1907#############################################################################
1753 1908
1754package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1763 1918
1764sub new { 1919sub new {
1765 my $class = shift; 1920 my $class = shift;
1766 1921
1767 $class->SUPER::new ( 1922 $class->SUPER::new (
1768 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1769 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1771 can_hover => 1, 1927 can_hover => 1,
1772 align => 0, 1928 align => 0,
1773 valign => 0, 1929 valign => 0,
… …
1782 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1783 1939
1784 $self->emit ("activate") 1940 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1787} 1945}
1788 1946
1789sub _draw { 1947sub _draw {
1790 my ($self) = @_; 1948 my ($self) = @_;
1791 1949
1792 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1793
1794 if ($GRAB == $self) {
1795 $self->{fg} = $self->{active_fg};
1796 }
1797 1951
1798 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1801 1955
… …
1820 1974
1821sub new { 1975sub new {
1822 my $class = shift; 1976 my $class = shift;
1823 1977
1824 $class->SUPER::new ( 1978 $class->SUPER::new (
1825 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1826 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1985 state => 0,
… …
1834} 1989}
1835 1990
1836sub size_request { 1991sub size_request {
1837 my ($self) = @_; 1992 my ($self) = @_;
1838 1993
1839 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1840} 1995}
1841 1996
1842sub button_down { 1997sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1844 1999
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1849 } 2008 1
1850} 2009}
1851 2010
1852sub _draw { 2011sub _draw {
1853 my ($self) = @_; 2012 my ($self) = @_;
1854 2013
1855 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1856 2015
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 2017
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2018 my ($w, $h) = @$self{qw(w h)};
2019
2020 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 2021
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 2023
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 2025
… …
2019 2180
2020 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2022 2183
2023 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2185 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2186 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2189
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2136 vertical => 0, 2298 vertical => 0,
2137 can_hover => 1, 2299 can_hover => 1,
2138 inner_pad => 0.02, 2300 inner_pad => 0.02,
2139 @_ 2301 @_
2140 ); 2302 );
… …
2143 $self->update; 2305 $self->update;
2144 2306
2145 $self 2307 $self
2146} 2308}
2147 2309
2310sub changed { }
2311
2148sub set_range { 2312sub set_range {
2149 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2150 2314
2151 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2152 2316
2153 $self->update
2154 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2155} 2321}
2156 2322
2157sub set_value { 2323sub set_value {
2158 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2159 2325
… …
2178} 2344}
2179 2345
2180sub size_request { 2346sub size_request {
2181 my ($self) = @_; 2347 my ($self) = @_;
2182 2348
2183 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2350}
2188 2351
2189sub button_down { 2352sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2191 2354
2192 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2193 2356
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2358
2196 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2197} 2360}
2198 2361
2199sub mouse_motion { 2362sub mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2201 2364
… …
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2369
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2371
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2372 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2373 } else {
2374 return 0;
2375 }
2376
2210 } 2377 1
2211} 2378}
2212 2379
2213sub update { 2380sub update {
2214 my ($self) = @_; 2381 my ($self) = @_;
2215 2382
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2383 delete $self->{knob_w};
2384 $self->SUPER::update;
2385}
2386
2387sub _draw {
2388 my ($self) = @_;
2389
2390 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2218 2392
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2221 2395
… …
2227 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2229 2403
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2232 }); 2406 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2407
2240 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2241 2409
2242 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2243 2411
… …
2304sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2305sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2306 2474
2307############################################################################# 2475#############################################################################
2308 2476
2309package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2310 2478
2311our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2312 2480
2313use CFClient::OpenGL; 2481use CFClient::OpenGL;
2314 2482
… …
2316 my $class = shift; 2484 my $class = shift;
2317 2485
2318 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2319 fontsize => 1, 2487 fontsize => 1,
2320 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2321 #font => default_font 2490 #font => default_font
2322 @_, 2491 @_,
2323 2492
2324 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2325 par => [], 2494 par => [],
… …
2348 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2349 2518
2350 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2351 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2352 $self->{layout}->set_width ($self->{children}[0]{w}); 2521 $self->{layout}->set_width ($self->{children}[0]{w});
2522 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2353 2523
2354 $self->reflow; 2524 $self->reflow;
2355} 2525}
2356 2526
2357sub text_size { 2527sub text_size {
… …
2359 2529
2360 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2361 2531
2362 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2363 $layout->set_width ($self->{children}[0]{w} - $indent); 2533 $layout->set_width ($self->{children}[0]{w} - $indent);
2534 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2364 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2365 2536
2366 $layout->size 2537 $layout->size
2367} 2538}
2368 2539
… …
2407 2578
2408 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2409 2580
2410 delete $self->{texture}; 2581 delete $self->{texture};
2411 2582
2412 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2413 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2414 2585
2415 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2416 my $height = 0; 2587 my $height = 0;
2417 2588
… …
2420 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2421 2592
2422 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2423 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2424 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2425 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2426 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2427 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2428 $_->[1] = $h; 2600 $_->[1] = $h;
2429 } 2601 }
… …
2432 } 2604 }
2433 2605
2434 $self->{height} = $height; 2606 $self->{height} = $height;
2435 2607
2436 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2437 2609
2438 delete $self->{texture}; 2610 delete $self->{texture};
2439 } 2611 }
2440 2612
2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2442 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2443 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2444 2616
2445 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2446 2618
2447 my $y0 = $top; 2619 my $y0 = $top;
… …
2461 my $h = $par->[1]; 2633 my $h = $par->[1];
2462 2634
2463 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2464 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2465 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2466 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2467 2640
2468 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2469 2642
2470 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2482sub _draw { 2655sub _draw {
2483 my ($self) = @_; 2656 my ($self) = @_;
2484 2657
2485 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2661 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2489 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2490 2663
2491 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2492 2665
2493} 2666}
… …
2542 2715
2543sub new { 2716sub new {
2544 my $class = shift; 2717 my $class = shift;
2545 2718
2546 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2547 state => 0, 2720 state => 0,
2548 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2549 @_ 2722 @_
2550 ); 2723 );
2551 2724
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2725 $self
2558} 2726}
2559 2727
2560sub toggle_flopper { 2728sub toggle_flopper {
2561 my ($self) = @_; 2729 my ($self) = @_;
2562 2730
2563 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2732}
2575 2733
2576############################################################################# 2734#############################################################################
2577 2735
2578package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2591} 2749}
2592 2750
2593sub set_tooltip_from { 2751sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2595 2753
2754 my $tooltip = $widget->{tooltip};
2755
2756 if ($ENV{CFPLUS_DEBUG} & 2) {
2757 $tooltip .= "\n\n" . (ref $widget) . "\n"
2758 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2759 . "req $widget->{req_w} $widget->{req_h}\n"
2760 . "visible $widget->{visible}";
2761 }
2762
2763 $tooltip =~ s/^\n+//;
2764 $tooltip =~ s/\n+$//;
2765
2596 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2769 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2771 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2783
2614sub size_allocate { 2784sub size_allocate {
2615 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2616 2786
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2787 $self->SUPER::size_allocate ($w - 4, $h - 4);
2788}
2789
2790sub visibility_change {
2791 my ($self, $visible) = @_;
2792
2793 return unless $visible;
2794
2795 $self->{root}->on_post_alloc ("move_$self" => sub {
2796 my $widget = $self->{owner}
2797 or return;
2798
2799 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2800
2801 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2802 if $x + $self->{w} > $self->{root}{w};
2803
2804 $self->move_abs ($x, $y);
2805 });
2618} 2806}
2619 2807
2620sub _draw { 2808sub _draw {
2621 my ($self) = @_; 2809 my ($self) = @_;
2622 2810
… …
2639 glVertex $w, $h; 2827 glVertex $w, $h;
2640 glVertex $w, 0; 2828 glVertex $w, 0;
2641 glEnd; 2829 glEnd;
2642 2830
2643 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2644 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2645} 2834}
2646 2835
2647############################################################################# 2836#############################################################################
2648 2837
… …
2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2708 2897
2709 if ($tex) { 2898 if ($tex) {
2710 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2712 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2714 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2715 } 2904 }
2716} 2905}
2717 2906
2718sub DESTROY { 2907sub destroy {
2719 my ($self) = @_; 2908 my ($self) = @_;
2720 2909
2721 $self->{timer}->cancel 2910 $self->{timer}->cancel
2722 if $self->{timer}; 2911 if $self->{timer};
2723 2912
2724 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2725} 2914}
2726 2915
2727############################################################################# 2916#############################################################################
2728 2917
2729package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2730 2919
2731our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2732 2921
2733sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2923
2774############################################################################# 2924#############################################################################
2775 2925
2776package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2777 2927
… …
2789 ); 2939 );
2790 2940
2791 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2792 2942
2793 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2794 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2795 2945
2796 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2797 if (!ref $widget) { 2947 if (!ref $widget) {
2798 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2799 can_hover => 1, 2949 can_hover => 1,
2800 can_events => 1, 2950 can_events => 1,
2801 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2802 } 2953 }
2803 2954
2804 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2805 2956
2806 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2818 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2970 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2821 2972
2822 $self->show; 2973 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2974 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2975}
2825 2976
2826sub mouse_motion { 2977sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2828 2979
2829 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2832} 2985}
2833 2986
2834sub button_up { 2987sub button_up {
2835 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2836 2989
… …
2838 undef $GRAB; 2991 undef $GRAB;
2839 $self->hide; 2992 $self->hide;
2840 2993
2841 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2843 } 3000 1
2844} 3001}
2845 3002
2846############################################################################# 3003#############################################################################
2847 3004
2848package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2849 3006
2850our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2851 3008
2852sub new { 3009sub new {
2853 my $class = shift; 3010 my $class = shift;
2854 3011
2855 $class->SUPER::new ( 3012 my $self = $class->SUPER::new (
3013 @_,
3014 );
3015
3016 $self->{current} = $self->{children}[0]
3017 if @{ $self->{children} };
3018
3019 $self
3020}
3021
3022sub add {
3023 my ($self, @widgets) = @_;
3024
3025 $self->SUPER::add (@widgets);
3026
3027 $self->{current} = $self->{children}[0]
3028 if @{ $self->{children} };
3029}
3030
3031sub set_current_page {
3032 my ($self, $page_or_widget) = @_;
3033
3034 my $widget = ref $page_or_widget
3035 ? $page_or_widget
3036 : $self->{children}[$page_or_widget];
3037
3038 $self->{current} = $widget;
3039 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3040
3041 $self->_emit (page_changed => $self->{current});
3042
3043 $self->realloc;
3044}
3045
3046sub visible_children {
3047 $_[0]{current}
3048}
3049
3050sub size_request {
3051 my ($self) = @_;
3052
3053 $self->{current}->size_request
3054}
3055
3056sub size_allocate {
3057 my ($self, $w, $h) = @_;
3058
3059 $self->{current}->configure (0, 0, $w, $h);
3060}
3061
3062sub _draw {
3063 my ($self) = @_;
3064
3065 $self->{current}->draw;
3066}
3067
3068#############################################################################
3069
3070package CFClient::UI::Notebook;
3071
3072our @ISA = CFClient::UI::VBox::;
3073
3074sub new {
3075 my $class = shift;
3076
3077 my $self = $class->SUPER::new (
3078 buttonbar => (new CFClient::UI::Buttonbar),
3079 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3080 # filter => # will be put between multiplexer and $self
3081 @_,
3082 );
3083
3084 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3085 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3086
3087 $self
3088}
3089
3090sub add {
3091 my ($self, $title, $widget, $tooltip) = @_;
3092
3093 Scalar::Util::weaken $self;
3094
3095 $self->{buttonbar}->add (new CFClient::UI::Button
3096 markup => $title,
3097 tooltip => $tooltip,
3098 on_activate => sub { $self->set_current_page ($widget) },
3099 );
3100
3101 $self->{multiplexer}->add ($widget);
3102}
3103
3104sub set_current_page {
3105 my ($self, $page) = @_;
3106
3107 $self->{multiplexer}->set_current_page ($page);
3108 $self->_emit (page_changed => $self->{multiplexer}{current});
3109}
3110
3111#############################################################################
3112
3113package CFClient::UI::Combobox;
3114
3115use utf8;
3116
3117our @ISA = CFClient::UI::Button::;
3118
3119sub new {
3120 my $class = shift;
3121
3122 my $self = $class->SUPER::new (
3123 options => [], # [value, title, longdesc], ...
3124 value => undef,
3125 @_,
3126 );
3127
3128 $self->_set_value ($self->{value});
3129
3130 $self
3131}
3132
3133sub button_down {
3134 my ($self, $ev) = @_;
3135
3136 my @menu_items;
3137
3138 for (@{ $self->{options} }) {
3139 my ($value, $title, $tooltip) = @$_;
3140
3141 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3142 }
3143
3144 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3145}
3146
3147sub _set_value {
3148 my ($self, $value) = @_;
3149
3150 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3151 or return;
3152
3153 $self->{value} = $item->[0];
3154 $self->set_markup ("$item->[1] ⇓");
3155 $self->set_tooltip ($item->[2]);
3156}
3157
3158sub set_value {
3159 my ($self, $value) = @_;
3160
3161 return unless $self->{value} ne $value;
3162
3163 $self->_set_value ($value);
3164 $self->_emit (changed => $value);
3165}
3166
3167#############################################################################
3168
3169package CFClient::UI::Statusbox;
3170
3171our @ISA = CFClient::UI::VBox::;
3172
3173sub new {
3174 my $class = shift;
3175
3176 my $self = $class->SUPER::new (
2856 fontsize => 0.8, 3177 fontsize => 0.8,
2857 @_, 3178 @_,
2858 ) 3179 );
3180
3181 Scalar::Util::weaken (my $this = $self);
3182
3183 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3184
3185 $self
2859} 3186}
2860 3187
2861sub reorder { 3188sub reorder {
2862 my ($self) = @_; 3189 my ($self) = @_;
2863 my $NOW = time; 3190 my $NOW = Time::HiRes::time;
3191
3192 # freeze display when hovering over any label
3193 return if $CFClient::UI::TOOLTIP->{owner}
3194 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3195 values %{ $self->{item} };
2864 3196
2865 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 } 3199 }
2868 3200
… …
2871 my @items = sort { 3203 my @items = sort {
2872 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2875 3207
3208 $self->{timer}->interval (1);
3209
2876 my $count = 10 + 1; 3210 my $count = 10 + 1;
2877 for my $item (@items) { 3211 for my $item (@items) {
2878 last unless --$count; 3212 last unless --$count;
2879 3213
2880 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text}; 3218 : $item->{text};
2885 3219
… …
2893 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2899 can_events => 1, 3233 can_events => 1,
2900 can_hover => 1 3234 can_hover => 1
2901 }; 3235 };
3236
3237 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3238 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3239 $label->update;
3240 $label->set_max_size (undef, $label->{req_h} * $diff)
3241 if $diff < 1;
3242 $self->{timer}->interval (1/30);
3243 } else {
3244 $label->{fg}[3] = $item->{fg}[3] || 1;
3245 }
3246
3247 push @widgets, $label;
2902 } 3248 }
2903 3249
2904 $self->clear; 3250 $self->clear;
2905 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2906} 3252}
… …
2911 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2913 3259
2914 return unless $text; 3260 return unless $text;
2915 3261
2916 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2917 3263
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919 3265
2920 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2922 $item->{count}++; 3268 $item->{count}++;
2923 } else { 3269 } else {
2924 $item->{count} = 1; 3270 $item->{count} = 1;
2925 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2926 } 3272 }
2927 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2928 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2929 delete $item->{label}; 3275 delete $item->{label};
2930 } else { 3276 } else {
2931 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2932 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2951 3297
2952 $self->reorder; 3298 $self->reorder;
2953 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2954} 3300}
2955 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2956############################################################################# 3310#############################################################################
2957 3311
2958package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2959 3313
2960our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3315
2964sub new { 3316sub new {
2965 my $class = shift; 3317 my $class = shift;
2966 3318
2967 $class->SUPER::new ( 3319 my $self = $class->SUPER::new (
3320 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3321 @_,
3322 );
3323
3324 $self
3325}
3326
3327sub set_items {
3328 my ($self, $items) = @_;
3329
3330 $self->{child}->clear;
3331 return unless $items;
3332
3333 my @items = sort {
3334 ($a->{type} <=> $b->{type})
3335 or ($a->{name} cmp $b->{name})
3336 } @$items;
3337
3338 $self->{real_items} = \@items;
3339
3340 my $row = 0;
3341 for my $item (@items) {
3342 CFClient::Item::update_widgets $item;
3343
3344 $self->{child}->add (0, $row, $item->{face_widget});
3345 $self->{child}->add (1, $row, $item->{desc_widget});
3346 $self->{child}->add (2, $row, $item->{weight_widget});
3347
3348 $row++;
3349 }
3350}
3351
3352#############################################################################
3353
3354package CFClient::UI::BindEditor;
3355
3356our @ISA = CFClient::UI::FancyFrame::;
3357
3358sub new {
3359 my $class = shift;
3360
3361 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3362
3363 $self->add (my $vb = new CFClient::UI::VBox);
3364
3365
3366 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3367 text => "start recording",
3368 tooltip => "Start/Stops recording of actions."
3369 ."All subsequent actions after the recording started will be captured."
3370 ."The actions are displayed after the record was stopped."
3371 ."To bind the action you have to click on the 'Bind' button",
3372 on_activate => sub {
3373 unless ($self->{recording}) {
3374 $self->start;
3375 } else {
3376 $self->stop;
3377 }
3378 });
3379
3380 $vb->add (new CFClient::UI::Label text => "Actions:");
3381 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3382
3383 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3384 $vb->add (my $hb = new CFClient::UI::HBox);
3385 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3386 $hb->add (new CFClient::UI::Button
3387 text => "bind",
3388 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3389 on_activate => sub {
3390 $self->ask_for_bind;
3391 });
3392
3393 $vb->add (my $hb = new CFClient::UI::HBox);
3394 $hb->add (new CFClient::UI::Button
3395 text => "ok",
3396 expand => 1,
3397 tooltip => "This closes the binding editor and saves the binding",
3398 on_activate => sub {
3399 $self->hide;
3400 $self->commit;
3401 });
3402
3403 $hb->add (new CFClient::UI::Button
3404 text => "cancel",
3405 expand => 1,
3406 tooltip => "This closes the binding editor without saving",
3407 on_activate => sub {
3408 $self->hide;
3409 $self->{binding_cancel}->()
3410 if $self->{binding_cancel};
3411 });
3412
3413 $self->update_binding_widgets;
3414
3415 $self
3416}
3417
3418sub commit {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 if ($sym != 0 && @$cmds > 0) {
3422 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3423 ."'. Don't forget 'Save Config'!");
3424 $self->{binding_change}->($mod, $sym, $cmds)
3425 if $self->{binding_change};
3426 } else {
3427 $::STATUSBOX->add ("No action bound, no key or action specified!");
3428 $self->{binding_cancel}->()
3429 if $self->{binding_cancel};
3430 }
3431}
3432
3433sub start {
3434 my ($self) = @_;
3435
3436 $self->{rec_btn}->set_text ("stop recording");
3437 $self->{recording} = 1;
3438 $self->clear_command_list;
3439 $::CONN->start_record if $::CONN;
3440}
3441
3442sub stop {
3443 my ($self) = @_;
3444
3445 $self->{rec_btn}->set_text ("start recording");
3446 $self->{recording} = 0;
3447
3448 my $rec;
3449 $rec = $::CONN->stop_record if $::CONN;
3450 return unless ref $rec eq 'ARRAY';
3451 $self->set_command_list ($rec);
3452}
3453
3454
3455sub ask_for_bind_and_commit {
3456 my ($self) = @_;
3457 $self->ask_for_bind (1);
3458}
3459
3460sub ask_for_bind {
3461 my ($self, $commit) = @_;
3462
3463 CFClient::Binder::open_binding_dialog (sub {
3464 my ($mod, $sym) = @_;
3465 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3466 $self->update_binding_widgets;
3467 $self->commit if $commit;
3468 });
3469}
3470
3471# $mod and $sym are the modifiers and key symbol
3472# $cmds is a array ref of strings (the commands)
3473# $cb is the callback that is executed on OK
3474# $ccb is the callback that is executed on CANCEL and
3475# when the binding was unsuccessful on OK
3476sub set_binding {
3477 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3478
3479 $self->clear_command_list;
3480 $self->{recording} = 0;
3481 $self->{rec_btn}->set_text ("start recording");
3482
3483 $self->{binding} = [$mod, $sym];
3484 $self->{commands} = $cmds;
3485
3486 $self->{binding_change} = $cb;
3487 $self->{binding_cancel} = $ccb;
3488
3489 $self->update_binding_widgets;
3490}
3491
3492# this is a shortcut method that asks for a binding
3493# and then just binds it.
3494sub do_quick_binding {
3495 my ($self, $cmds) = @_;
3496 $self->set_binding (undef, undef, $cmds, sub {
3497 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3498 });
3499 $self->ask_for_bind (1);
3500}
3501
3502sub update_binding_widgets {
3503 my ($self) = @_;
3504 my ($mod, $sym, $cmds) = $self->get_binding;
3505 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3506 $self->set_command_list ($cmds);
3507}
3508
3509sub get_binding {
3510 my ($self) = @_;
3511 return (
3512 $self->{binding}->[0],
3513 $self->{binding}->[1],
3514 [ grep { defined $_ } @{$self->{commands}} ]
3515 );
3516}
3517
3518sub clear_command_list {
3519 my ($self) = @_;
3520 $self->{cmdbox}->clear ();
3521}
3522
3523sub set_command_list {
3524 my ($self, $cmds) = @_;
3525
3526 $self->{cmdbox}->clear ();
3527 $self->{commands} = $cmds;
3528
3529 my $idx = 0;
3530
3531 for (@$cmds) {
3532 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3533
3534 my $i = $idx;
3535 $hb->add (new CFClient::UI::Label text => $_);
3536 $hb->add (new CFClient::UI::Button
3537 text => "delete",
3538 tooltip => "Deletes the action from the record",
3539 on_activate => sub {
3540 $self->{cmdbox}->remove ($hb);
3541 $cmds->[$i] = undef;
3542 });
3543
3544
3545 $idx++
3546 }
3547}
3548
3549#############################################################################
3550
3551package CFClient::UI::SpellList;
3552
3553our @ISA = CFClient::UI::Table::;
3554
3555sub new {
3556 my $class = shift;
3557
3558 my $self = $class->SUPER::new (
3559 binding => [],
3560 commands => [],
2968 @_, 3561 @_,
2969 ) 3562 )
2970} 3563}
2971 3564
2972sub configure { 3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2973 my ($self, $x, $y, $w, $h) = @_;
2974 3566
2975 $self->{w} = $w; 3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2976 $self->{h} = $h; 3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2977} 3569my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3570 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3571my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3572 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3573my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3574 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3575my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3576 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2978 3577
2979sub check_size { 3578sub rebuild_spell_list {
3579 my ($self) = @_;
3580
3581 $CFClient::UI::ROOT->on_refresh ($self => sub {
3582 $self->clear;
3583
3584 return unless $::CONN;
3585
3586 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3587 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3588 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3589 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3590 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3591
3592 my $row = 0;
3593
3594 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3595 my $spell = $self->{spell}{$_};
3596
3597 $row++;
3598
3599 my $spell_cb = sub {
3600 my ($widget, $ev) = @_;
3601
3602 if ($ev->{button} == 1) {
3603 $::CONN->user_send ("cast $spell->{name}");
3604 } elsif ($ev->{button} == 2) {
3605 $::CONN->user_send ("invoke $spell->{name}");
3606 } elsif ($ev->{button} == 3) {
3607 (new CFClient::UI::Menu
3608 items => [
3609 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3610 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3611 ],
3612 )->popup ($ev);
3613 } else {
3614 return 0;
3615 }
3616
3617 1
3618 };
3619
3620 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3621
3622 #TODO: add path info to tooltip
3623 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3624
3625 $self->add (0, $row, new CFClient::UI::Face
3626 face => $spell->{face},
3627 can_hover => 1,
3628 can_events => 1,
3629 tooltip => $tooltip,
3630 on_button_down => $spell_cb,
3631 );
3632
3633 $self->add (1, $row, new CFClient::UI::Label
3634 expand => 1,
3635 text => $spell->{name},
3636 can_hover => 1,
3637 can_events => 1,
3638 tooltip => $tooltip,
3639 on_button_down => $spell_cb,
3640 );
3641
3642 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3643 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3644 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3645 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3646 }
3647 });
3648}
3649
3650sub add_spell {
2980 my ($self) = @_; 3651 my ($self, $spell) = @_;
2981 3652
2982 $self->size_allocate ($self->{w}, $self->{h}) 3653 $self->{spell}->{$spell->{name}} = $spell;
2983 if $self->{w}; 3654 $self->rebuild_spell_list;
3655}
3656
3657sub remove_spell {
3658 my ($self, $spell) = @_;
3659
3660 delete $self->{spell}->{$spell->{name}};
3661 $self->rebuild_spell_list;
3662}
3663
3664sub clear_spells {
3665 my ($self) = @_;
3666
3667 $self->{spell} = {};
3668 $self->rebuild_spell_list;
3669}
3670
3671#############################################################################
3672
3673package CFClient::UI::Root;
3674
3675our @ISA = CFClient::UI::Container::;
3676
3677use List::Util qw(min max);
3678
3679use CFClient::OpenGL;
3680
3681sub new {
3682 my $class = shift;
3683
3684 my $self = $class->SUPER::new (
3685 visible => 1,
3686 @_,
3687 );
3688
3689 Scalar::Util::weaken ($self->{root} = $self);
3690
3691 $self
2984} 3692}
2985 3693
2986sub size_request { 3694sub size_request {
2987 my ($self) = @_; 3695 my ($self) = @_;
2988 3696
2989 ($self->{w}, $self->{h}) 3697 ($self->{w}, $self->{h})
3698}
3699
3700sub _to_pixel {
3701 my ($coord, $size, $max) = @_;
3702
3703 $coord =
3704 $coord eq "center" ? ($max - $size) * 0.5
3705 : $coord eq "max" ? $max
3706 : $coord;
3707
3708 $coord = 0 if $coord < 0;
3709 $coord = $max - $size if $coord > $max - $size;
3710
3711 int $coord + 0.5
2990} 3712}
2991 3713
2992sub size_allocate { 3714sub size_allocate {
2993 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2994 3716
2995 for my $child ($self->children) { 3717 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3718 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3719
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3000 3722
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3725
3007 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3008 } 3727 }
3009} 3728}
3010 3729
… …
3021} 3740}
3022 3741
3023sub update { 3742sub update {
3024 my ($self) = @_; 3743 my ($self) = @_;
3025 3744
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3028} 3746}
3029 3747
3030sub add { 3748sub add {
3031 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3032 3750
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3041 3752 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3753
3047 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3048} 3755}
3049 3756
3050sub remove { 3757sub remove {
3051 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3052 3759
3053 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3054 3764
3055 while (@children) { 3765 while (@children) {
3056 my $w = pop @children; 3766 my $w = pop @children;
3057 push @children, $w->children; 3767 push @children, $w->children;
3058 $w->set_invisible; 3768 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3078 $_->() 3788 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3080 } 3790 }
3081 3791
3082 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3083 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
3084 3796
3085 for (;;) { 3797 outer:
3086 if ($self->{check_size}) { 3798 while () {
3087 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3801 $widget->{visible} or next; # do not resize invisible widgets
3802
3803 $queue{$widget+0}++ and next; # duplicates are common
3804
3805 push @{ $queue[$widget->{visible}] }, $widget;
3806 }
3090 } 3807 }
3091 3808
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
3093 3811
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3813 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3814
3815 pop @queue;
3816 }
3817
3818 delete $queue{$widget+0};
3819
3820 my ($w, $h) = $widget->size_request;
3821
3822 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3823 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3824
3825 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3826 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3827
3828 $w = $widget->{force_w} if exists $widget->{force_w};
3829 $h = $widget->{force_h} if exists $widget->{force_h};
3830
3831 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3832 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3104 3835
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3106 3837
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3838 if (my $parent = $widget->{parent}) {
3839 $self->{realloc}{$parent+0} = $parent
3840 unless $queue{$parent+0};
3841
3842 $parent->{force_size_alloc} = 1;
3843 $self->{size_alloc}{$parent+0} = $parent;
3844 }
3109 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3110 } 3848 }
3111 } 3849 }
3112 3850
3113 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3853 values %$size_alloc;
3854
3855 while () {
3856 my $widget = pop @queue || last;
3857
3858 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3859
3117 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3119 3862
3863 $w = int $w + 0.5;
3864 $h = int $h + 0.5;
3865
3866 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3867 $widget->{old_w} = $widget->{w};
3868 $widget->{old_h} = $widget->{h};
3869
3120 $widget->{w} = $w; 3870 $widget->{w} = $w;
3121 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3122 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3123 } 3875 }
3124 } 3876 }
3125 3877
3126 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3127 $_->() 3879 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3129 } 3881 }
3882
3130 3883
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3134 3887
… …
3136 glLoadIdentity; 3889 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3892 glLoadIdentity;
3140 3893
3894 {
3895 package CFClient::UI::Base;
3896
3897 ($draw_x, $draw_y, $draw_w, $draw_h) =
3898 (0, 0, $self->{w}, $self->{h});
3899 }
3900
3141 $self->_draw; 3901 $self->_draw;
3142} 3902}
3143 3903
3144############################################################################# 3904#############################################################################
3145 3905

Diff Legend

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