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.241 by root, Fri May 26 20:50:35 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;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
233 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
234 delete $self->{root}; 278 delete $self->{root};
235 delete $self->{visible};
236 279
237 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
239 282
240 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
241 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
242 285
243 $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;
244} 306}
245 307
246sub hide { 308sub hide {
247 my ($self) = @_; 309 my ($self) = @_;
248 310
… …
250 312
251 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
252 if $self->{parent}; 314 if $self->{parent};
253} 315}
254 316
255sub move { 317sub move_abs {
256 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
257 319
258 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
259 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
260 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
261 323
262 $self->update; 324 $self->update;
263} 325}
264 326
265sub set_size { 327sub set_size {
266 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
267 329
268 $self->{user_w} = $w; 330 $self->{force_w} = $w;
269 $self->{user_h} = $h; 331 $self->{force_h} = $h;
270 332
271 $self->check_size; 333 $self->realloc;
272} 334}
273 335
274sub size_request { 336sub size_request {
275 require Carp; 337 require Carp;
276 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
278 340
279sub configure { 341sub configure {
280 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
281 343
282 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
283 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
284 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
285 349
286 # use alignment to adjust x, y 350 # use alignment to adjust x, y
287 351
288 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
289 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
290
291 ($w, $h) = ($w2, $h2);
292 } 354 }
293 355
294 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
295 $self->{x} = $x; 357 $self->{x} = $x;
296 $self->{y} = $y; 358 $self->{y} = $y;
297 $self->update; 359 $self->update;
298 } 360 }
299 361
300 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
301 $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;
302 } 369 }
303} 370}
304 371
305sub size_allocate { 372sub size_allocate {
306 # nothing to be done 373 # nothing to be done
307} 374}
308 375
309sub reconfigure {
310 my ($self) = @_;
311
312 $self->check_size (1);
313 $self->update;
314}
315
316sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
317} 382}
318 383
319sub set_max_size { 384sub set_max_size {
320 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
321 386
322 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
323 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
324} 391}
325 392
326sub set_tooltip { 393sub set_tooltip {
327 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
328 395
… …
333 400
334 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
335 402
336 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
337 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
338 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
339 } 406 }
340} 407}
341 408
342# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
343sub coord2local { 410sub coord2local {
… …
380 447
381 $::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
382 unless $FOCUS; 449 unless $FOCUS;
383} 450}
384 451
385sub mouse_motion { } 452sub mouse_motion { 0 }
386sub button_up { } 453sub button_up { 0 }
387sub key_down { } 454sub key_down { 0 }
388sub key_up { } 455sub key_up { 0 }
389 456
390sub button_down { 457sub button_down {
391 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
392 459
393 $self->focus_in; 460 $self->focus_in;
394}
395 461
396sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
397sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
398sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
399sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
400sub 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
401 538
402sub draw { 539sub draw {
403 my ($self) = @_; 540 my ($self) = @_;
404 541
405 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);
406 553
407 glPushMatrix; 554 glPushMatrix;
408 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
409 $self->_draw;
410 glPopMatrix;
411 556
412 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
413 my ($x, $y) = @$self{qw(x y)};
414
415 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
416 glEnable GL_BLEND; 559 glEnable GL_BLEND;
417 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
418 glBegin GL_QUADS; 561 glBegin GL_QUADS;
419 glVertex $x , $y; 562 glVertex 0 , 0;
420 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
421 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
422 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
423 glEnd; 566 glEnd;
424 glDisable GL_BLEND; 567 glDisable GL_BLEND;
425 } 568 }
426 569
427 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
428 glPushMatrix; 571 glPushMatrix;
429 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
430 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
431 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
432 glVertex 0 , 0; 575 glVertex 0 , 0;
433 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
434 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
435 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
436 glEnd; 579 glEnd;
437 glPopMatrix; 580 glPopMatrix;
438 #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;
439 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
440} 586}
441 587
442sub _draw { 588sub _draw {
443 my ($self) = @_; 589 my ($self) = @_;
444 590
445 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
446} 592}
447 593
448sub find_widget {
449 my ($self, $x, $y) = @_;
450
451 return () unless $self->{can_events};
452
453 return $self
454 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
455 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
456
457 ()
458}
459
460sub set_parent {
461 my ($self, $parent) = @_;
462
463 Scalar::Util::weaken ($self->{parent} = $parent);
464
465 $self->{root} = $parent->{root};
466 $self->{visible} = $parent->{visible} + 1;
467
468 # TODO: req_w _does_change after ->reconfigure
469 $self->check_size
470 unless exists $self->{req_w};
471
472 $self->show;
473}
474
475sub check_size {
476 my ($self, $forced) = @_;
477
478 $self->{force_alloc} = 1 if $forced;
479 $CFClient::UI::ROOT->{check_size}{$self} = $self;
480}
481
482sub update {
483 my ($self) = @_;
484
485 $self->{parent}->update
486 if $self->{parent};
487}
488
489sub connect {
490 my ($self, $signal, $cb) = @_;
491
492 push @{ $self->{signal_cb}{$signal} }, $cb;
493}
494
495sub _emit {
496 my ($self, $signal, @args) = @_;
497
498 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
499}
500
501sub emit {
502 my ($self, $signal, @args) = @_;
503
504 $self->_emit ($signal, @args)
505 || $self->$signal (@args);
506}
507
508sub DESTROY { 594sub DESTROY {
509 my ($self) = @_; 595 my ($self) = @_;
510 596
511 delete $WIDGET{$self+0}; 597 delete $WIDGET{$self+0};
512 #$self->deactivate; 598
599 eval { $self->destroy };
600 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
513} 601}
514 602
515############################################################################# 603#############################################################################
516 604
517package CFClient::UI::DrawBG; 605package CFClient::UI::DrawBG;
… …
542 630
543 if ($color && (@$color < 4 || $color->[3])) { 631 if ($color && (@$color < 4 || $color->[3])) {
544 my ($w, $h) = @$self{qw(w h)}; 632 my ($w, $h) = @$self{qw(w h)};
545 633
546 glEnable GL_BLEND; 634 glEnable GL_BLEND;
547 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 635 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
548 glColor @$color; 636 glColor_premultiply @$color;
549 637
550 glBegin GL_QUADS; 638 glBegin GL_QUADS;
551 glVertex 0 , 0; 639 glVertex 0 , 0;
552 glVertex 0 , $h; 640 glVertex 0 , $h;
553 glVertex $w, $h; 641 glVertex $w, $h;
… …
568 my ($class, %arg) = @_; 656 my ($class, %arg) = @_;
569 $class->SUPER::new (can_events => 0, %arg); 657 $class->SUPER::new (can_events => 0, %arg);
570} 658}
571 659
572sub size_request { 660sub size_request {
573 (0, 0) 661 my ($self) = @_;
662
663 ($self->{w} + 0, $self->{h} + 0)
574} 664}
575 665
576sub draw { } 666sub draw { }
577 667
578############################################################################# 668#############################################################################
… …
582our @ISA = CFClient::UI::Base::; 672our @ISA = CFClient::UI::Base::;
583 673
584sub new { 674sub new {
585 my ($class, %arg) = @_; 675 my ($class, %arg) = @_;
586 676
587 my $children = delete $arg{children} || []; 677 my $children = delete $arg{children};
588 678
589 my $self = $class->SUPER::new ( 679 my $self = $class->SUPER::new (
590 children => [], 680 children => [],
591 can_events => 0, 681 can_events => 0,
592 %arg, 682 %arg,
593 ); 683 );
684
594 $self->add ($_) for @$children; 685 $self->add (@$children)
686 if $children;
595 687
596 $self 688 $self
597} 689}
598 690
599sub add { 691sub add {
… …
607 $self->{children} = [ 699 $self->{children} = [
608 sort { $a->{z} <=> $b->{z} } 700 sort { $a->{z} <=> $b->{z} }
609 @{$self->{children}}, @widgets 701 @{$self->{children}}, @widgets
610 ]; 702 ];
611 703
612 $self->check_size (1); 704 $self->realloc;
613 $self->update;
614} 705}
615 706
616sub children { 707sub children {
617 @{ $_[0]{children} } 708 @{ $_[0]{children} }
618} 709}
… …
623 delete $child->{parent}; 714 delete $child->{parent};
624 $child->hide; 715 $child->hide;
625 716
626 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 717 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
627 718
628 $self->check_size (1); 719 $self->realloc;
629 $self->update;
630} 720}
631 721
632sub clear { 722sub clear {
633 my ($self) = @_; 723 my ($self) = @_;
634 724
… …
638 for (@$children) { 728 for (@$children) {
639 delete $_->{parent}; 729 delete $_->{parent};
640 $_->hide; 730 $_->hide;
641 } 731 }
642 732
643 $self->check_size; 733 $self->realloc;
644 $self->update;
645} 734}
646 735
647sub find_widget { 736sub find_widget {
648 my ($self, $x, $y) = @_; 737 my ($self, $x, $y) = @_;
649 738
650 $x -= $self->{x}; 739 $x -= $self->{x};
651 $y -= $self->{y}; 740 $y -= $self->{y};
652 741
653 my $res; 742 my $res;
654 743
655 for (reverse @{ $self->{children} }) { 744 for (reverse $self->visible_children) {
656 $res = $_->find_widget ($x, $y) 745 $res = $_->find_widget ($x, $y)
657 and return $res; 746 and return $res;
658 } 747 }
659 748
660 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 749 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
681} 770}
682 771
683sub add { 772sub add {
684 my ($self, $child) = @_; 773 my ($self, $child) = @_;
685 774
686 $self->{children} = []; 775 $self->SUPER::remove ($_) for @{ $self->{children} };
687
688 $self->SUPER::add ($child); 776 $self->SUPER::add ($child);
689} 777}
690 778
691sub remove { 779sub remove {
692 my ($self, $widget) = @_; 780 my ($self, $widget) = @_;
… …
709 $self->{children}[0]->configure (0, 0, $w, $h); 797 $self->{children}[0]->configure (0, 0, $w, $h);
710} 798}
711 799
712############################################################################# 800#############################################################################
713 801
802# back-buffered drawing area
803
714package CFClient::UI::Window; 804package CFClient::UI::Window;
715 805
716our @ISA = CFClient::UI::Bin::; 806our @ISA = CFClient::UI::Bin::;
717 807
718use CFClient::OpenGL; 808use CFClient::OpenGL;
… …
736 $self->SUPER::size_allocate ($w, $h); 826 $self->SUPER::size_allocate ($w, $h);
737 $self->update; 827 $self->update;
738} 828}
739 829
740sub _render { 830sub _render {
831 my ($self) = @_;
832
741 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
742} 834}
743 835
744sub render_child { 836sub render_child {
745 my ($self) = @_; 837 my ($self) = @_;
746 838
747 $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 {
748 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
749 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
750 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
751 $self->_render; 850 $self->_render;
752 }; 851 };
753} 852}
754 853
755sub _draw { 854sub _draw {
756 my ($self) = @_; 855 my ($self) = @_;
757 856
758 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
759 858
760 my $tex = $self->{texture} 859 my $tex = $self->{texture}
761 or return; 860 or return;
762 861
763 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
764 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
765 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
766 865
767 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
768 867
769 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
770} 869}
… …
786} 885}
787 886
788sub size_request { 887sub size_request {
789 my ($self) = @_; 888 my ($self) = @_;
790 889
791 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
792 891
793 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
893 $h = 10 if $self->{scroll_y};
894
895 ($w, $h)
794} 896}
795 897
796sub size_allocate { 898sub size_allocate {
797 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
798 900
901 my $child = $self->child;
902
799 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
800 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
801 905
802 $self->child->configure (0, 0, $w, $h); 906 $self->child->configure (0, 0, $w, $h);
803 $self->update; 907 $self->update;
804} 908}
805 909
… …
841} 945}
842 946
843sub _render { 947sub _render {
844 my ($self) = @_; 948 my ($self) = @_;
845 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
846 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 953 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
847 954
848 $self->SUPER::_render; 955 $self->SUPER::_render;
849} 956}
850 957
… …
853package CFClient::UI::ScrolledWindow; 960package CFClient::UI::ScrolledWindow;
854 961
855our @ISA = CFClient::UI::HBox::; 962our @ISA = CFClient::UI::HBox::;
856 963
857sub new { 964sub new {
858 my $class = shift; 965 my ($class, %arg) = @_;
966
967 my $child = delete $arg{child};
859 968
860 my $self; 969 my $self;
861 970
862 my $slider = new CFClient::UI::Slider 971 my $slider = new CFClient::UI::Slider
863 vertical => 1, 972 vertical => 1,
864 range => [0, 0, 1, 0.01], # HACK fix 973 range => [0, 0, 1, 0.01], # HACK fix
865 connect_changed => sub { 974 on_changed => sub {
866 $self->{vp}->set_offset (0, $_[1]); 975 $self->{vp}->set_offset (0, $_[1]);
867 }, 976 },
868 ; 977 ;
869 978
870 $self = $class->SUPER::new ( 979 $self = $class->SUPER::new (
871 vp => (new CFClient::UI::ViewPort expand => 1), 980 vp => (new CFClient::UI::ViewPort expand => 1),
872 slider => $slider, 981 slider => $slider,
873 @_, 982 %arg,
874 ); 983 );
875 984
876 $self->{vp}->add ($self->{scrolled});
877 $self->add ($self->{vp});
878 $self->add ($self->{slider}); 985 $self->SUPER::add ($self->{vp}, $self->{slider});
986 $self->add ($child) if $child;
879 987
880 $self 988 $self
989}
990
991sub add {
992 my ($self, $widget) = @_;
993
994 $self->{vp}->add ($self->{child} = $widget);
881} 995}
882 996
883sub update { 997sub update {
884 my ($self) = @_; 998 my ($self) = @_;
885 999
… …
924 1038
925 if ($self->{bg}) { 1039 if ($self->{bg}) {
926 my ($w, $h) = @$self{qw(w h)}; 1040 my ($w, $h) = @$self{qw(w h)};
927 1041
928 glEnable GL_BLEND; 1042 glEnable GL_BLEND;
929 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1043 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
930 glColor @{ $self->{bg} }; 1044 glColor_premultiply @{ $self->{bg} };
931 1045
932 glBegin GL_QUADS; 1046 glBegin GL_QUADS;
933 glVertex 0 , 0; 1047 glVertex 0 , 0;
934 glVertex 0 , $h; 1048 glVertex 0 , $h;
935 glVertex $w, $h; 1049 glVertex $w, $h;
… …
948 1062
949our @ISA = CFClient::UI::Bin::; 1063our @ISA = CFClient::UI::Bin::;
950 1064
951use CFClient::OpenGL; 1065use CFClient::OpenGL;
952 1066
953my @tex = 1067my $bg =
1068 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1069 mipmap => 1, wrap => 1;
1070
1071my @border =
954 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1072 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
955 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);
956 1074
957sub new { 1075sub new {
958 my $class = shift; 1076 my ($class, %arg) = @_;
959
960 # TODO: user_x, user_y, overwrite moveto?
961 1077
962 my $self = $class->SUPER::new ( 1078 my $self = $class->SUPER::new (
963 bg => [1, 1, 1, 1], 1079 bg => [1, 1, 1, 1],
964 border_bg => [1, 1, 1, 1], 1080 border_bg => [1, 1, 1, 1],
965 border => 0.6, 1081 border => 0.6,
966 is_toplevel => 1,
967 can_events => 1, 1082 can_events => 1,
968 @_ 1083 min_w => 16,
1084 min_h => 16,
1085 %arg,
969 ); 1086 );
970 1087
971 $self->{title} &&= new CFClient::UI::Label 1088 $self->{title_widget} = new CFClient::UI::Label
972 align => 0, 1089 align => 0,
973 valign => 1, 1090 valign => 1,
974 text => $self->{title}, 1091 text => $self->{title},
975 fontsize => $self->{border}; 1092 fontsize => $self->{border},
1093 if exists $self->{title};
976 1094
977 $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};
978} 1103}
979 1104
980sub border { 1105sub border {
981 int $_[0]{border} * $::FONTSIZE 1106 int $_[0]{border} * $::FONTSIZE
982} 1107}
983 1108
984sub size_request { 1109sub size_request {
985 my ($self) = @_; 1110 my ($self) = @_;
1111
1112 $self->{title_widget}->size_request
1113 if $self->{title_widget};
986 1114
987 my ($w, $h) = $self->SUPER::size_request; 1115 my ($w, $h) = $self->SUPER::size_request;
988 1116
989 ( 1117 (
990 $w + $self->border * 2, 1118 $w + $self->border * 2,
… …
993} 1121}
994 1122
995sub size_allocate { 1123sub size_allocate {
996 my ($self, $w, $h) = @_; 1124 my ($self, $w, $h) = @_;
997 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
998 $h -= List::Util::max 0, $self->border * 2; 1134 $h -= List::Util::max 0, $border * 2;
999 $w -= List::Util::max 0, $self->border * 2; 1135 $w -= List::Util::max 0, $border * 2;
1000 1136
1001 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1002 if $self->{title};
1003
1004 $self->child->configure ($self->border, $self->border, $w, $h); 1137 $self->child->configure ($border, $border, $w, $h);
1005} 1138}
1006 1139
1007sub button_down { 1140sub button_down {
1008 my ($self, $ev, $x, $y) = @_; 1141 my ($self, $ev, $x, $y) = @_;
1009 1142
… …
1025 my ($ev, $x, $y) = @_; 1158 my ($ev, $x, $y) = @_;
1026 1159
1027 my $dx = $ev->{x} - $ox; 1160 my $dx = $ev->{x} - $ox;
1028 my $dy = $ev->{y} - $oy; 1161 my $dy = $ev->{y} - $oy;
1029 1162
1030 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1163 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1031 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1164 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1165
1032 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1033 $self->check_size; 1167 $self->realloc;
1034 }; 1168 };
1035 1169
1036 } elsif ($lr ^ $td) { 1170 } elsif ($lr ^ $td) {
1037 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1171 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1038 my ($bx, $by) = ($self->{x}, $self->{y}); 1172 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1040 $self->{motion} = sub { 1174 $self->{motion} = sub {
1041 my ($ev, $x, $y) = @_; 1175 my ($ev, $x, $y) = @_;
1042 1176
1043 ($x, $y) = ($ev->{x}, $ev->{y}); 1177 ($x, $y) = ($ev->{x}, $ev->{y});
1044 1178
1045 $self->move ($bx + $x - $ox, $by + $y - $oy); 1179 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1046 $self->update; 1180 # HACK: the next line is required to enforce placement
1181 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1047 }; 1182 };
1183 } else {
1184 return 0;
1185 }
1186
1048 } 1187 1
1049} 1188}
1050 1189
1051sub button_up { 1190sub button_up {
1052 my ($self, $ev, $x, $y) = @_; 1191 my ($self, $ev, $x, $y) = @_;
1053 1192
1054 delete $self->{motion}; 1193 !!delete $self->{motion}
1055} 1194}
1056 1195
1057sub mouse_motion { 1196sub mouse_motion {
1058 my ($self, $ev, $x, $y) = @_; 1197 my ($self, $ev, $x, $y) = @_;
1059 1198
1060 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1199 $self->{motion}->($ev, $x, $y) if $self->{motion};
1200
1201 !!$self->{motion}
1061} 1202}
1062 1203
1063sub _draw { 1204sub _draw {
1064 my ($self) = @_; 1205 my ($self) = @_;
1065 1206
1207 my $child = $self->{children}[0];
1208
1066 my ($w, $h ) = ($self->{w}, $self->{h}); 1209 my ($w, $h ) = ($self->{w}, $self->{h});
1067 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1210 my ($cw, $ch) = ($child->{w}, $child->{h});
1068 1211
1069 glEnable GL_TEXTURE_2D; 1212 glEnable GL_TEXTURE_2D;
1070 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1071 1214
1072 my $border = $self->border; 1215 my $border = $self->border;
1073 1216
1074 glColor @{ $self->{border_bg} }; 1217 glColor @{ $self->{border_bg} };
1075 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1218 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1076 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1219 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1077 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1220 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1078 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1221 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1079 1222
1080 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1223 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1081 my $bg = $tex[0]; 1224 glColor @{ $self->{bg} };
1082 1225
1083 # TODO: repeat texture not scale 1226 # TODO: repeat texture not scale
1227 # solve this better(?)
1084 my $rep_x = $cw / $bg->{w}; 1228 $bg->{s} = $cw / $bg->{w};
1085 my $rep_y = $ch / $bg->{h}; 1229 $bg->{t} = $ch / $bg->{h};
1086
1087 glColor @{ $self->{bg} };
1088
1089 $bg->{s} = $rep_x;
1090 $bg->{t} = $rep_y;
1091 $bg->{wrap_mode} = 1;
1092 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1230 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1093 } 1231 }
1094 1232
1095 glDisable GL_TEXTURE_2D; 1233 glDisable GL_TEXTURE_2D;
1096 1234
1097 $self->{title}->draw if $self->{title};
1098
1099 $self->child->draw; 1235 $child->draw;
1236
1237 if ($self->{title_widget}) {
1238 glTranslate 0, $border - $self->{h};
1239 $self->{title_widget}->_draw;
1240 }
1100} 1241}
1101 1242
1102############################################################################# 1243#############################################################################
1103 1244
1104package CFClient::UI::Table; 1245package CFClient::UI::Table;
… …
1126 my ($self, $x, $y, $child) = @_; 1267 my ($self, $x, $y, $child) = @_;
1127 1268
1128 $child->set_parent ($self); 1269 $child->set_parent ($self);
1129 $self->{children}[$y][$x] = $child; 1270 $self->{children}[$y][$x] = $child;
1130 1271
1131 $self->check_size (1); 1272 $self->realloc;
1273}
1274
1275sub remove {
1276 my ($self, $child) = @_;
1277
1278 # TODO: not yet implemented
1132} 1279}
1133 1280
1134# 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?
1135sub clear { 1282sub clear {
1136 my ($self) = @_; 1283 my ($self) = @_;
… …
1141 for (@children) { 1288 for (@children) {
1142 delete $_->{parent}; 1289 delete $_->{parent};
1143 $_->hide; 1290 $_->hide;
1144 } 1291 }
1145 1292
1146 $self->check_size (1); 1293 $self->realloc;
1147 $self->update;
1148} 1294}
1149 1295
1150sub get_wh { 1296sub get_wh {
1151 my ($self) = @_; 1297 my ($self) = @_;
1152 1298
… …
1248 } 1394 }
1249} 1395}
1250 1396
1251############################################################################# 1397#############################################################################
1252 1398
1253package CFClient::UI::HBox; 1399package CFClient::UI::Box;
1254
1255# TODO: wrap into common Box base class
1256 1400
1257our @ISA = CFClient::UI::Container::; 1401our @ISA = CFClient::UI::Container::;
1258 1402
1259sub size_request { 1403sub size_request {
1260 my ($self) = @_; 1404 my ($self) = @_;
1261 1405
1262 my @alloc = map [$_->size_request], @{$self->{children}}; 1406 $self->{vertical}
1263 1407 ? (
1264 ( 1408 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1265 (List::Util::sum map $_->[0], @alloc), 1409 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1266 (List::Util::max map $_->[1], @alloc), 1410 )
1267 ) 1411 : (
1412 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1413 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1414 )
1268} 1415}
1269 1416
1270sub size_allocate { 1417sub size_allocate {
1271 my ($self, $w, $h) = @_; 1418 my ($self, $w, $h) = @_;
1272 1419
1273 ($h, $w) = ($w, $h); 1420 my $space = $self->{vertical} ? $h : $w;
1274
1275 my $children = $self->{children}; 1421 my $children = $self->{children};
1276 1422
1277 my @h = map $_->{req_w}, @$children; 1423 my @req;
1278 1424
1279 my $req_h = List::Util::sum @h; 1425 if ($self->{homogeneous}) {
1280 1426 @req = ($space / (@$children || 1)) x @$children;
1281 if ($req_h > $h) {
1282 # ah well, not enough space
1283 $_ *= $h / $req_h for @h;
1284 } 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 {
1285 my $exp = List::Util::sum map $_->{expand}, @$children; 1435 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1286 $exp ||= 1;
1287 1436
1437 $space = ($space - $req) / $expand; # remaining space to give away
1438
1439 $req[$_] += $space * $children->[$_]{expand}
1288 for (0 .. $#$children) { 1440 for 0 .. $#$children;
1289 my $child = $children->[$_];
1290
1291 my $alloc_h = $h[$_];
1292 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1293 $h[$_] = $alloc_h;
1294 } 1441 }
1295 } 1442 }
1296 1443
1297 CFClient::UI::harmonize \@h; 1444 CFClient::UI::harmonize \@req;
1298 1445
1299 my $y = 0; 1446 my $pos = 0;
1300 for (0 .. $#$children) { 1447 for (0 .. $#$children) {
1301 my $child = $children->[$_];
1302 my $h = $h[$_]; 1448 my $alloc = $req[$_];
1303 $child->configure ($y, 0, $h, $w); 1449 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1304 1450
1305 $y += $h; 1451 $pos += $alloc;
1306 } 1452 }
1307 1453
1308 1 1454 1
1309} 1455}
1310 1456
1311############################################################################# 1457#############################################################################
1312 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
1313package CFClient::UI::VBox; 1474package CFClient::UI::VBox;
1314 1475
1315# TODO: wrap into common Box base class
1316
1317our @ISA = CFClient::UI::Container::; 1476our @ISA = CFClient::UI::Box::;
1318 1477
1319sub size_request { 1478sub new {
1320 my ($self) = @_; 1479 my $class = shift;
1321 1480
1322 my @alloc = map [$_->size_request], @{$self->{children}}; 1481 $class->SUPER::new (
1323 1482 vertical => 1,
1324 ( 1483 @_,
1325 (List::Util::max map $_->[0], @alloc),
1326 (List::Util::sum map $_->[1], @alloc),
1327 ) 1484 )
1328}
1329
1330sub size_allocate {
1331 my ($self, $w, $h) = @_;
1332
1333 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1334
1335 my $children = $self->{children};
1336
1337 my @h = map $_->{req_h}, @$children;
1338
1339 my $req_h = List::Util::sum @h;
1340
1341 if ($req_h > $h) {
1342 # ah well, not enough space
1343 $_ *= $h / $req_h for @h;
1344 } else {
1345 my $exp = List::Util::sum map $_->{expand}, @$children;
1346 $exp ||= 1;
1347
1348 for (0 .. $#$children) {
1349 my $child = $children->[$_];
1350
1351 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1352 }
1353 }
1354
1355 CFClient::UI::harmonize \@h;
1356
1357 my $y = 0;
1358 for (0 .. $#$children) {
1359 my $child = $children->[$_];
1360 my $h = $h[$_];
1361 $child->configure (0, $y, $w, $h);
1362
1363 $y += $h;
1364 }
1365
1366 1
1367} 1485}
1368 1486
1369############################################################################# 1487#############################################################################
1370 1488
1371package CFClient::UI::Label; 1489package CFClient::UI::Label;
… …
1388 ellipsise => 3, # end 1506 ellipsise => 3, # end
1389 layout => (new CFClient::Layout), 1507 layout => (new CFClient::Layout),
1390 fontsize => 1, 1508 fontsize => 1,
1391 align => -1, 1509 align => -1,
1392 valign => -1, 1510 valign => -1,
1393 padding => 2, 1511 padding_x => 2,
1512 padding_y => 2,
1394 can_events => 0, 1513 can_events => 0,
1395 %arg 1514 %arg
1396 ); 1515 );
1397 1516
1398 if (exists $self->{template}) { 1517 if (exists $self->{template}) {
… …
1425 1544
1426 delete $self->{texture}; 1545 delete $self->{texture};
1427 $self->SUPER::update; 1546 $self->SUPER::update;
1428} 1547}
1429 1548
1549sub realloc {
1550 my ($self) = @_;
1551
1552 delete $self->{ox};
1553 $self->SUPER::realloc;
1554}
1555
1430sub set_text { 1556sub set_text {
1431 my ($self, $text) = @_; 1557 my ($self, $text) = @_;
1432 1558
1433 return if $self->{text} eq "T$text"; 1559 return if $self->{text} eq "T$text";
1434 $self->{text} = "T$text"; 1560 $self->{text} = "T$text";
1435 1561
1436 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1562 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1437 $self->{layout}->set_text ($text); 1563 $self->{layout}->set_text ($text);
1438 1564
1565 delete $self->{size_req};
1566 $self->realloc;
1439 $self->update; 1567 $self->update;
1440 $self->check_size;
1441} 1568}
1442 1569
1443sub set_markup { 1570sub set_markup {
1444 my ($self, $markup) = @_; 1571 my ($self, $markup) = @_;
1445 1572
… …
1449 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1576 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1450 1577
1451 $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;
1452 $self->{layout}->set_markup ($markup); 1579 $self->{layout}->set_markup ($markup);
1453 1580
1581 delete $self->{size_req};
1582 $self->realloc;
1454 $self->update; 1583 $self->update;
1455 $self->check_size;
1456} 1584}
1457 1585
1458sub size_request { 1586sub size_request {
1459 my ($self) = @_; 1587 my ($self) = @_;
1460 1588
1589 $self->{size_req} ||= do {
1461 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1590 $self->{layout}->set_font ($self->{font}) if $self->{font};
1462 $self->{layout}->set_width ($self->{max_w} || -1); 1591 $self->{layout}->set_width ($self->{max_w} || -1);
1463 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1592 $self->{layout}->set_ellipsise ($self->{ellipsise});
1464 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1593 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1465 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1594 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1466 1595
1467 my ($w, $h) = $self->{layout}->size; 1596 my ($w, $h) = $self->{layout}->size;
1468 1597
1469 if (exists $self->{template}) { 1598 if (exists $self->{template}) {
1470 $self->{template}->set_font ($self->{font}) if $self->{font}; 1599 $self->{template}->set_font ($self->{font}) if $self->{font};
1471 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1600 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1472 1601
1473 my ($w2, $h2) = $self->{template}->size; 1602 my ($w2, $h2) = $self->{template}->size;
1474 1603
1475 $w = List::Util::max $w, $w2; 1604 $w = List::Util::max $w, $w2;
1476 $h = List::Util::max $h, $h2; 1605 $h = List::Util::max $h, $h2;
1606 }
1607
1608 [$w, $h]
1477 } 1609 };
1478 1610
1479 ( 1611 @{ $self->{size_req} }
1480 $w + $self->{padding} * 2,
1481 $h + $self->{padding} * 2,
1482 )
1483} 1612}
1484 1613
1485sub size_allocate { 1614sub size_allocate {
1486 my ($self, $w, $h) = @_; 1615 my ($self, $w, $h) = @_;
1487 1616
1617 delete $self->{ox};
1618
1488 delete $self->{texture}; 1619 delete $self->{texture}
1620 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1489} 1621}
1490 1622
1491sub set_fontsize { 1623sub set_fontsize {
1492 my ($self, $fontsize) = @_; 1624 my ($self, $fontsize) = @_;
1493 1625
1494 $self->{fontsize} = $fontsize; 1626 $self->{fontsize} = $fontsize;
1495 delete $self->{texture}; 1627 delete $self->{texture};
1496 1628
1497 $self->update; 1629 $self->realloc;
1498 $self->check_size; 1630}
1631
1632sub reconfigure {
1633 my ($self) = @_;
1634
1635 delete $self->{size_req};
1636
1637 $self->SUPER::reconfigure;
1499} 1638}
1500 1639
1501sub _draw { 1640sub _draw {
1502 my ($self) = @_; 1641 my ($self) = @_;
1503 1642
… …
1509 $self->{layout}->set_width ($self->{w}); 1648 $self->{layout}->set_width ($self->{w});
1510 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1649 $self->{layout}->set_ellipsise ($self->{ellipsise});
1511 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1650 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1512 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1651 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1513 1652
1514 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1653 new_from_layout CFClient::Texture $self->{layout}
1654 };
1515 1655
1656 unless (exists $self->{ox}) {
1516 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1657 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1517 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1658 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1518 : ($self->{w} - $tex->{w}) * 0.5); 1659 : ($self->{w} - $tex->{w}) * 0.5);
1519 1660
1520 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1661 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1521 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1662 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1522 : ($self->{h} - $tex->{h}) * 0.5); 1663 : ($self->{h} - $tex->{h}) * 0.5);
1523
1524 $tex
1525 }; 1664 };
1526 1665
1527 glEnable GL_TEXTURE_2D; 1666 glEnable GL_TEXTURE_2D;
1528 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};
1529 1670
1530 if ($tex->{format} == GL_ALPHA) { 1671 if ($tex->{format} == GL_ALPHA) {
1672 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531 glColor @{$self->{fg}}; 1673 glColor @{$self->{fg}};
1532 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1674 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1533 } else { 1675 } else {
1676 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1534 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1677 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1535 } 1678 }
1536 1679
1537 glDisable GL_TEXTURE_2D; 1680 glDisable GL_TEXTURE_2D;
1538} 1681}
1539 1682
… …
1556 can_hover => 1, 1699 can_hover => 1,
1557 can_focus => 1, 1700 can_focus => 1,
1558 valign => 0, 1701 valign => 0,
1559 can_events => 1, 1702 can_events => 1,
1560 #text => ... 1703 #text => ...
1704 #hidden => "*",
1561 @_ 1705 @_
1562 ) 1706 )
1563} 1707}
1564 1708
1565sub _set_text { 1709sub _set_text {
… …
1567 1711
1568 delete $self->{cur_h}; 1712 delete $self->{cur_h};
1569 1713
1570 return if $self->{text} eq $text; 1714 return if $self->{text} eq $text;
1571 1715
1572 delete $self->{texture};
1573
1574 $self->{last_activity} = $::NOW; 1716 $self->{last_activity} = $::NOW;
1575 $self->{text} = $text; 1717 $self->{text} = $text;
1576 1718
1577 $text =~ s/./*/g if $self->{hidden}; 1719 $text =~ s/./*/g if $self->{hidden};
1578 $self->{layout}->set_text ("$text "); 1720 $self->{layout}->set_text ("$text ");
1721 delete $self->{size_req};
1579 1722
1580 $self->_emit (changed => $self->{text}); 1723 $self->_emit (changed => $self->{text});
1724
1725 $self->realloc;
1726 $self->update;
1581} 1727}
1582 1728
1583sub set_text { 1729sub set_text {
1584 my ($self, $text) = @_; 1730 my ($self, $text) = @_;
1585 1731
1586 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1587 $self->_set_text ($text); 1733 $self->_set_text ($text);
1588 $self->update;
1589 $self->check_size;
1590} 1734}
1591 1735
1592sub get_text { 1736sub get_text {
1593 $_[0]{text} 1737 $_[0]{text}
1594} 1738}
… …
1624 $self->{cursor} = length $text; 1768 $self->{cursor} = length $text;
1625 } elsif ($uni == 27) { 1769 } elsif ($uni == 27) {
1626 $self->_emit ('escape'); 1770 $self->_emit ('escape');
1627 } elsif ($uni) { 1771 } elsif ($uni) {
1628 substr $text, $self->{cursor}++, 0, chr $uni; 1772 substr $text, $self->{cursor}++, 0, chr $uni;
1773 } else {
1774 return 0;
1629 } 1775 }
1630 1776
1631 $self->_set_text ($text); 1777 $self->_set_text ($text);
1632 $self->update; 1778
1633 $self->check_size; 1779 $self->realloc;
1780
1781 1
1634} 1782}
1635 1783
1636sub focus_in { 1784sub focus_in {
1637 my ($self) = @_; 1785 my ($self) = @_;
1638 1786
… …
1653 utf8::encode $text; 1801 utf8::encode $text;
1654 $self->{cursor} = length substr $text, 0, $idx; 1802 $self->{cursor} = length substr $text, 0, $idx;
1655 1803
1656 $self->_set_text ($self->{text}); 1804 $self->_set_text ($self->{text});
1657 $self->update; 1805 $self->update;
1806
1807 1
1658} 1808}
1659 1809
1660sub mouse_motion { 1810sub mouse_motion {
1661 my ($self, $ev, $x, $y) = @_; 1811 my ($self, $ev, $x, $y) = @_;
1662# 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
1663} 1815}
1664 1816
1665sub _draw { 1817sub _draw {
1666 my ($self) = @_; 1818 my ($self) = @_;
1667 1819
1668 local $self->{fg} = $self->{fg}; 1820 local $self->{fg} = $self->{fg};
1669 1821
1670 if ($FOCUS == $self) { 1822 if ($FOCUS == $self) {
1671 glColor @{$self->{active_bg}}; 1823 glColor_premultiply @{$self->{active_bg}};
1672 $self->{fg} = $self->{active_fg}; 1824 $self->{fg} = $self->{active_fg};
1673 } else { 1825 } else {
1674 glColor @{$self->{bg}}; 1826 glColor_premultiply @{$self->{bg}};
1675 } 1827 }
1676 1828
1677 glEnable GL_BLEND; 1829 glEnable GL_BLEND;
1678 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1830 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1679 glBegin GL_QUADS; 1831 glBegin GL_QUADS;
1680 glVertex 0 , 0; 1832 glVertex 0 , 0;
1681 glVertex 0 , $self->{h}; 1833 glVertex 0 , $self->{h};
1682 glVertex $self->{w}, $self->{h}; 1834 glVertex $self->{w}, $self->{h};
1683 glVertex $self->{w}, 0; 1835 glVertex $self->{w}, 0;
… …
1744 } else { 1896 } else {
1745 $self->set_text ($self->{history_saveback}); 1897 $self->set_text ($self->{history_saveback});
1746 } 1898 }
1747 1899
1748 } else { 1900 } else {
1749 $self->SUPER::key_down ($ev); 1901 return $self->SUPER::key_down ($ev)
1902 }
1903
1750 } 1904 1
1751
1752} 1905}
1753 1906
1754############################################################################# 1907#############################################################################
1755 1908
1756package CFClient::UI::Button; 1909package CFClient::UI::Button;
… …
1765 1918
1766sub new { 1919sub new {
1767 my $class = shift; 1920 my $class = shift;
1768 1921
1769 $class->SUPER::new ( 1922 $class->SUPER::new (
1770 padding => 4, 1923 padding_x => 4,
1924 padding_y => 4,
1771 fg => [1, 1, 1], 1925 fg => [1, 1, 1],
1772 active_fg => [0, 0, 1], 1926 active_fg => [0, 0, 1],
1773 can_hover => 1, 1927 can_hover => 1,
1774 align => 0, 1928 align => 0,
1775 valign => 0, 1929 valign => 0,
… …
1784 my ($self, $ev, $x, $y) = @_; 1938 my ($self, $ev, $x, $y) = @_;
1785 1939
1786 $self->emit ("activate") 1940 $self->emit ("activate")
1787 if $x >= 0 && $x < $self->{w} 1941 if $x >= 0 && $x < $self->{w}
1788 && $y >= 0 && $y < $self->{h}; 1942 && $y >= 0 && $y < $self->{h};
1943
1944 1
1789} 1945}
1790 1946
1791sub _draw { 1947sub _draw {
1792 my ($self) = @_; 1948 my ($self) = @_;
1793 1949
1794 local $self->{fg} = $self->{fg}; 1950 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1795
1796 if ($GRAB == $self) {
1797 $self->{fg} = $self->{active_fg};
1798 }
1799 1951
1800 glEnable GL_TEXTURE_2D; 1952 glEnable GL_TEXTURE_2D;
1801 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1953 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1802 glColor 0, 0, 0, 1; 1954 glColor 0, 0, 0, 1;
1803 1955
… …
1822 1974
1823sub new { 1975sub new {
1824 my $class = shift; 1976 my $class = shift;
1825 1977
1826 $class->SUPER::new ( 1978 $class->SUPER::new (
1827 padding => 2, 1979 padding_x => 2,
1980 padding_y => 2,
1828 fg => [1, 1, 1], 1981 fg => [1, 1, 1],
1829 active_fg => [1, 1, 0], 1982 active_fg => [1, 1, 0],
1830 bg => [0, 0, 0, 0.2], 1983 bg => [0, 0, 0, 0.2],
1831 active_bg => [1, 1, 1, 0.5], 1984 active_bg => [1, 1, 1, 0.5],
1832 state => 0, 1985 state => 0,
… …
1836} 1989}
1837 1990
1838sub size_request { 1991sub size_request {
1839 my ($self) = @_; 1992 my ($self) = @_;
1840 1993
1841 ($self->{padding} * 2 + 6) x 2 1994 (6) x 2
1842} 1995}
1843 1996
1844sub button_down { 1997sub button_down {
1845 my ($self, $ev, $x, $y) = @_; 1998 my ($self, $ev, $x, $y) = @_;
1846 1999
1847 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2000 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1848 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2001 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1849 $self->{state} = !$self->{state}; 2002 $self->{state} = !$self->{state};
1850 $self->_emit (changed => $self->{state}); 2003 $self->_emit (changed => $self->{state});
2004 } else {
2005 return 0
2006 }
2007
1851 } 2008 1
1852} 2009}
1853 2010
1854sub _draw { 2011sub _draw {
1855 my ($self) = @_; 2012 my ($self) = @_;
1856 2013
1857 $self->SUPER::_draw; 2014 $self->SUPER::_draw;
1858 2015
1859 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2016 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1860 2017
1861 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;
1862 2021
1863 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2022 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1864 2023
1865 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2024 my $tex = $self->{state} ? $tex[1] : $tex[0];
1866 2025
… …
2021 2180
2022 my $h1 = $self->{h} * (1 - $ycut1); 2181 my $h1 = $self->{h} * (1 - $ycut1);
2023 my $h2 = $self->{h} * (1 - $ycut2); 2182 my $h2 = $self->{h} * (1 - $ycut2);
2024 2183
2025 glEnable GL_BLEND; 2184 glEnable GL_BLEND;
2026 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;
2027 glEnable GL_TEXTURE_2D; 2187 glEnable GL_TEXTURE_2D;
2028 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2188 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2029 2189
2030 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2190 glBindTexture GL_TEXTURE_2D, $t1->{name};
2031 glBegin GL_QUADS; 2191 glBegin GL_QUADS;
… …
2131 fg => [1, 1, 1], 2291 fg => [1, 1, 1],
2132 active_fg => [0, 0, 0], 2292 active_fg => [0, 0, 0],
2133 bg => [0, 0, 0, 0.2], 2293 bg => [0, 0, 0, 0.2],
2134 active_bg => [1, 1, 1, 0.5], 2294 active_bg => [1, 1, 1, 0.5],
2135 range => [0, 0, 100, 10, 0], 2295 range => [0, 0, 100, 10, 0],
2136 req_w => $::WIDTH / 80, 2296 min_w => $::WIDTH / 80,
2137 req_h => $::WIDTH / 80, 2297 min_h => $::WIDTH / 80,
2138 vertical => 0, 2298 vertical => 0,
2139 can_hover => 1, 2299 can_hover => 1,
2140 inner_pad => 0.02, 2300 inner_pad => 0.02,
2141 @_ 2301 @_
2142 ); 2302 );
… …
2145 $self->update; 2305 $self->update;
2146 2306
2147 $self 2307 $self
2148} 2308}
2149 2309
2310sub changed { }
2311
2150sub set_range { 2312sub set_range {
2151 my ($self, $range) = @_; 2313 my ($self, $range) = @_;
2152 2314
2153 ($range, $self->{range}) = ($self->{range}, $range); 2315 ($range, $self->{range}) = ($self->{range}, $range);
2154 2316
2155 $self->update
2156 if "@$range" ne "@{$self->{range}}"; 2317 if ("@$range" ne "@{$self->{range}}") {
2318 $self->update;
2319 $self->set_value ($self->{range}[0]);
2320 }
2157} 2321}
2158 2322
2159sub set_value { 2323sub set_value {
2160 my ($self, $value) = @_; 2324 my ($self, $value) = @_;
2161 2325
… …
2180} 2344}
2181 2345
2182sub size_request { 2346sub size_request {
2183 my ($self) = @_; 2347 my ($self) = @_;
2184 2348
2185 my $w = $self->{req_w}; 2349 ($self->{req_w}, $self->{req_h})
2186 my $h = $self->{req_h};
2187
2188 $self->{vertical} ? ($h, $w) : ($w, $h)
2189} 2350}
2190 2351
2191sub button_down { 2352sub button_down {
2192 my ($self, $ev, $x, $y) = @_; 2353 my ($self, $ev, $x, $y) = @_;
2193 2354
2194 $self->SUPER::button_down ($ev, $x, $y); 2355 $self->SUPER::button_down ($ev, $x, $y);
2195 2356
2196 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2357 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2197 2358
2198 $self->mouse_motion ($ev, $x, $y); 2359 $self->mouse_motion ($ev, $x, $y)
2199} 2360}
2200 2361
2201sub mouse_motion { 2362sub mouse_motion {
2202 my ($self, $ev, $x, $y) = @_; 2363 my ($self, $ev, $x, $y) = @_;
2203 2364
… …
2207 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2368 my (undef, $lo, $hi, $page) = @{$self->{range}};
2208 2369
2209 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2370 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2210 2371
2211 $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
2212 } 2377 1
2213} 2378}
2214 2379
2215sub update { 2380sub update {
2216 my ($self) = @_; 2381 my ($self) = @_;
2217 2382
2218 $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}) {
2219 $self->set_value ($self->{range}[0]); 2391 $self->set_value ($self->{range}[0]);
2220 2392
2221 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2393 my ($value, $lo, $hi, $page) = @{$self->{range}};
2222 my $range = ($hi - $page - $lo) || 1e-100; 2394 my $range = ($hi - $page - $lo) || 1e-100;
2223 2395
… …
2229 $value = ($value - $lo) / $range; 2401 $value = ($value - $lo) / $range;
2230 $value = $value * $self->{scale} + $self->{offset}; 2402 $value = $value * $self->{scale} + $self->{offset};
2231 2403
2232 $self->{knob_x} = $value - $knob_w * 0.5; 2404 $self->{knob_x} = $value - $knob_w * 0.5;
2233 $self->{knob_w} = $knob_w; 2405 $self->{knob_w} = $knob_w;
2234 }); 2406 }
2235
2236 $self->SUPER::update;
2237}
2238
2239sub _draw {
2240 my ($self) = @_;
2241 2407
2242 $self->SUPER::_draw (); 2408 $self->SUPER::_draw ();
2243 2409
2244 glScale $self->{w}, $self->{h}; 2410 glScale $self->{w}, $self->{h};
2245 2411
… …
2306sub set_range { shift->{slider}->set_range (@_) } 2472sub set_range { shift->{slider}->set_range (@_) }
2307sub set_value { shift->{slider}->set_value (@_) } 2473sub set_value { shift->{slider}->set_value (@_) }
2308 2474
2309############################################################################# 2475#############################################################################
2310 2476
2311package CFClient::UI::TextView; 2477package CFClient::UI::TextScroller;
2312 2478
2313our @ISA = CFClient::UI::HBox::; 2479our @ISA = CFClient::UI::HBox::;
2314 2480
2315use CFClient::OpenGL; 2481use CFClient::OpenGL;
2316 2482
… …
2318 my $class = shift; 2484 my $class = shift;
2319 2485
2320 my $self = $class->SUPER::new ( 2486 my $self = $class->SUPER::new (
2321 fontsize => 1, 2487 fontsize => 1,
2322 can_events => 0, 2488 can_events => 0,
2489 indent => 0,
2323 #font => default_font 2490 #font => default_font
2324 @_, 2491 @_,
2325 2492
2326 layout => (new CFClient::Layout 1), 2493 layout => (new CFClient::Layout 1),
2327 par => [], 2494 par => [],
… …
2350 $self->SUPER::size_allocate ($w, $h); 2517 $self->SUPER::size_allocate ($w, $h);
2351 2518
2352 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2519 $self->{layout}->set_font ($self->{font}) if $self->{font};
2353 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2520 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2354 $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});
2355 2523
2356 $self->reflow; 2524 $self->reflow;
2357} 2525}
2358 2526
2359sub text_size { 2527sub text_size {
… …
2361 2529
2362 my $layout = $self->{layout}; 2530 my $layout = $self->{layout};
2363 2531
2364 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2532 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2365 $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});
2366 $layout->set_markup ($text); 2535 $layout->set_markup ($text);
2367 2536
2368 $layout->size 2537 $layout->size
2369} 2538}
2370 2539
… …
2409 2578
2410 return unless $self->{h} > 0; 2579 return unless $self->{h} > 0;
2411 2580
2412 delete $self->{texture}; 2581 delete $self->{texture};
2413 2582
2414 $ROOT->on_post_alloc ($self, sub { 2583 $ROOT->on_post_alloc ($self => sub {
2415 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 2584 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2416 2585
2417 if (delete $self->{need_reflow}) { 2586 if (delete $self->{need_reflow}) {
2418 my $height = 0; 2587 my $height = 0;
2419 2588
… …
2422 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2591 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2423 2592
2424 for (@{$self->{par}}) { 2593 for (@{$self->{par}}) {
2425 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support 2594 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2426 $layout->set_width ($W - $_->[3]); 2595 $layout->set_width ($W - $_->[3]);
2596 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2427 $layout->set_markup ($_->[4]); 2597 $layout->set_markup ($_->[4]);
2428 my ($w, $h) = $layout->size; 2598 my ($w, $h) = $layout->size;
2429 $_->[0] = $w + $_->[3]; 2599 $_->[0] = $w + $_->[3];
2430 $_->[1] = $h; 2600 $_->[1] = $h;
2431 } 2601 }
… …
2434 } 2604 }
2435 2605
2436 $self->{height} = $height; 2606 $self->{height} = $height;
2437 2607
2438 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]); 2608 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2439 2609
2440 delete $self->{texture}; 2610 delete $self->{texture};
2441 } 2611 }
2442 2612
2443 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2613 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2444 glClearColor 0.5, 0.5, 0.5, 0; 2614 glClearColor 0, 0, 0, 0;
2445 glClear GL_COLOR_BUFFER_BIT; 2615 glClear GL_COLOR_BUFFER_BIT;
2446 2616
2447 my $top = int $self->{children}[1]{range}[0]; 2617 my $top = int $self->{children}[1]{range}[0];
2448 2618
2449 my $y0 = $top; 2619 my $y0 = $top;
… …
2463 my $h = $par->[1]; 2633 my $h = $par->[1];
2464 2634
2465 if ($y0 < $y + $h && $y < $y1) { 2635 if ($y0 < $y + $h && $y < $y1) {
2466 $layout->set_foreground (@{ $par->[2] }); 2636 $layout->set_foreground (@{ $par->[2] });
2467 $layout->set_width ($W - $par->[3]); 2637 $layout->set_width ($W - $par->[3]);
2638 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2468 $layout->set_markup ($par->[4]); 2639 $layout->set_markup ($par->[4]);
2469 2640
2470 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2641 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2471 2642
2472 glRasterPos $par->[3], $y - $y0; 2643 glRasterPos $par->[3], $y - $y0;
… …
2484sub _draw { 2655sub _draw {
2485 my ($self) = @_; 2656 my ($self) = @_;
2486 2657
2487 glEnable GL_TEXTURE_2D; 2658 glEnable GL_TEXTURE_2D;
2488 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2659 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2489 glColor 1, 1, 1, 1; 2660 glColor 0, 0, 0, 1;
2490 $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});
2491 glDisable GL_TEXTURE_2D; 2662 glDisable GL_TEXTURE_2D;
2492 2663
2493 $self->{children}[1]->draw; 2664 $self->{children}[1]->draw;
2494 2665
2495} 2666}
… …
2544 2715
2545sub new { 2716sub new {
2546 my $class = shift; 2717 my $class = shift;
2547 2718
2548 my $self = $class->SUPER::new ( 2719 my $self = $class->SUPER::new (
2549 state => 0, 2720 state => 0,
2550 connect_activate => \&toggle_flopper, 2721 on_activate => \&toggle_flopper,
2551 @_ 2722 @_
2552 ); 2723 );
2553 2724
2554 if ($self->{state}) {
2555 $self->{state} = 0;
2556 $self->toggle_flopper;
2557 }
2558
2559 $self 2725 $self
2560} 2726}
2561 2727
2562sub toggle_flopper { 2728sub toggle_flopper {
2563 my ($self) = @_; 2729 my ($self) = @_;
2564 2730
2565 # TODO: use animation 2731 $self->{other}->toggle_visibility;
2566 if ($self->{state} = !$self->{state}) {
2567 $CFClient::UI::ROOT->add ($self->{other});
2568 $self->{other}->move ($self->coord2global (0, $self->{h}));
2569 $self->_emit ("open");
2570 } else {
2571 $CFClient::UI::ROOT->remove ($self->{other});
2572 $self->_emit ("close");
2573 }
2574
2575 $self->_emit (changed => $self->{state});
2576} 2732}
2577 2733
2578############################################################################# 2734#############################################################################
2579 2735
2580package CFClient::UI::Tooltip; 2736package CFClient::UI::Tooltip;
… …
2593} 2749}
2594 2750
2595sub set_tooltip_from { 2751sub set_tooltip_from {
2596 my ($self, $widget) = @_; 2752 my ($self, $widget) = @_;
2597 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
2598 $self->add (new CFClient::UI::Label 2766 $self->add (new CFClient::UI::Label
2599 markup => $widget->{tooltip}, 2767 markup => $tooltip,
2600 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2768 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2601 fontsize => 0.8, 2769 fontsize => 0.8,
2602 fg => [0, 0, 0, 1], 2770 fg => [0, 0, 0, 1],
2603 ellipsise => 0, 2771 ellipsise => 0,
2604 font => ($widget->{tooltip_font} || $::FONT_PROP), 2772 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2615 2783
2616sub size_allocate { 2784sub size_allocate {
2617 my ($self, $w, $h) = @_; 2785 my ($self, $w, $h) = @_;
2618 2786
2619 $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 });
2620} 2806}
2621 2807
2622sub _draw { 2808sub _draw {
2623 my ($self) = @_; 2809 my ($self) = @_;
2624 2810
… …
2641 glVertex $w, $h; 2827 glVertex $w, $h;
2642 glVertex $w, 0; 2828 glVertex $w, 0;
2643 glEnd; 2829 glEnd;
2644 2830
2645 glTranslate 2 - 0.375, 2 - 0.375; 2831 glTranslate 2 - 0.375, 2 - 0.375;
2832
2646 $self->SUPER::_draw; 2833 $self->SUPER::_draw;
2647} 2834}
2648 2835
2649############################################################################# 2836#############################################################################
2650 2837
… …
2709 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2896 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2710 2897
2711 if ($tex) { 2898 if ($tex) {
2712 glEnable GL_TEXTURE_2D; 2899 glEnable GL_TEXTURE_2D;
2713 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2900 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2714 glColor 1, 1, 1, 1; 2901 glColor 0, 0, 0, 1;
2715 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2902 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2716 glDisable GL_TEXTURE_2D; 2903 glDisable GL_TEXTURE_2D;
2717 } 2904 }
2718} 2905}
2719 2906
2720sub DESTROY { 2907sub destroy {
2721 my ($self) = @_; 2908 my ($self) = @_;
2722 2909
2723 $self->{timer}->cancel 2910 $self->{timer}->cancel
2724 if $self->{timer}; 2911 if $self->{timer};
2725 2912
2726 $self->SUPER::DESTROY; 2913 $self->SUPER::destroy;
2727} 2914}
2728 2915
2729############################################################################# 2916#############################################################################
2730 2917
2731package CFClient::UI::Inventory; 2918package CFClient::UI::Buttonbar;
2732 2919
2733our @ISA = CFClient::UI::ScrolledWindow::; 2920our @ISA = CFClient::UI::HBox::;
2734 2921
2735sub new { 2922# TODO: should actualyl wrap buttons and other goodies.
2736 my $class = shift;
2737
2738 my $self = $class->SUPER::new (
2739 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2740 @_,
2741 );
2742
2743 $self
2744}
2745
2746sub set_items {
2747 my ($self, $items) = @_;
2748
2749 $self->{scrolled}->clear;
2750 return unless $items;
2751
2752 my @items = sort {
2753 ($a->{type} <=> $b->{type})
2754 or ($a->{name} cmp $b->{name})
2755 } @$items;
2756
2757 $self->{real_items} = \@items;
2758
2759 my $row = 0;
2760 for my $item (@items) {
2761 CFClient::Item::update_widgets $item;
2762
2763 $self->{scrolled}->add (0, $row, $item->{face_widget});
2764 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2765 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2766
2767 $row++;
2768 }
2769}
2770
2771sub size_request {
2772 my ($self) = @_;
2773 ($self->{req_w}, $self->{req_h});
2774}
2775 2923
2776############################################################################# 2924#############################################################################
2777 2925
2778package CFClient::UI::Menu; 2926package CFClient::UI::Menu;
2779 2927
… …
2791 ); 2939 );
2792 2940
2793 $self->add ($self->{vbox} = new CFClient::UI::VBox); 2941 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2794 2942
2795 for my $item (@{ $self->{items} }) { 2943 for my $item (@{ $self->{items} }) {
2796 my ($widget, $cb) = @$item; 2944 my ($widget, $cb, $tooltip) = @$item;
2797 2945
2798 # handle various types of items, only text for now 2946 # handle various types of items, only text for now
2799 if (!ref $widget) { 2947 if (!ref $widget) {
2800 $widget = new CFClient::UI::Label 2948 $widget = new CFClient::UI::Label
2801 can_hover => 1, 2949 can_hover => 1,
2802 can_events => 1, 2950 can_events => 1,
2803 text => $widget; 2951 markup => $widget,
2952 tooltip => $tooltip
2804 } 2953 }
2805 2954
2806 $self->{item}{$widget} = $item; 2955 $self->{item}{$widget} = $item;
2807 2956
2808 $self->{vbox}->add ($widget); 2957 $self->{vbox}->add ($widget);
… …
2820 # maybe save $GRAB? must be careful about events... 2969 # maybe save $GRAB? must be careful about events...
2821 $GRAB = $self; 2970 $GRAB = $self;
2822 $self->{button} = $ev->{button}; 2971 $self->{button} = $ev->{button};
2823 2972
2824 $self->show; 2973 $self->show;
2825 $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);
2826} 2975}
2827 2976
2828sub mouse_motion { 2977sub mouse_motion {
2829 my ($self, $ev, $x, $y) = @_; 2978 my ($self, $ev, $x, $y) = @_;
2830 2979
2831 # TODO: should use vbox->find_widget or so 2980 # TODO: should use vbox->find_widget or so
2832 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2981 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2833 $self->{hover} = $self->{item}{$HOVER}; 2982 $self->{hover} = $self->{item}{$HOVER};
2983
2984 0
2834} 2985}
2835 2986
2836sub button_up { 2987sub button_up {
2837 my ($self, $ev, $x, $y) = @_; 2988 my ($self, $ev, $x, $y) = @_;
2838 2989
… …
2840 undef $GRAB; 2991 undef $GRAB;
2841 $self->hide; 2992 $self->hide;
2842 2993
2843 $self->_emit ("popdown"); 2994 $self->_emit ("popdown");
2844 $self->{hover}[1]->() if $self->{hover}; 2995 $self->{hover}[1]->() if $self->{hover};
2996 } else {
2997 return 0
2998 }
2999
2845 } 3000 1
2846} 3001}
2847 3002
2848############################################################################# 3003#############################################################################
2849 3004
2850package CFClient::UI::Statusbox; 3005package CFClient::UI::Multiplexer;
2851 3006
2852our @ISA = CFClient::UI::VBox::; 3007our @ISA = CFClient::UI::Container::;
2853 3008
2854sub new { 3009sub new {
2855 my $class = shift; 3010 my $class = shift;
2856 3011
2857 $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 (
2858 fontsize => 0.8, 3177 fontsize => 0.8,
2859 @_, 3178 @_,
2860 ) 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
2861} 3186}
2862 3187
2863sub reorder { 3188sub reorder {
2864 my ($self) = @_; 3189 my ($self) = @_;
2865 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} };
2866 3196
2867 while (my ($k, $v) = each %{ $self->{item} }) { 3197 while (my ($k, $v) = each %{ $self->{item} }) {
2868 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3198 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2869 } 3199 }
2870 3200
… …
2873 my @items = sort { 3203 my @items = sort {
2874 $a->{pri} <=> $b->{pri} 3204 $a->{pri} <=> $b->{pri}
2875 or $b->{id} <=> $a->{id} 3205 or $b->{id} <=> $a->{id}
2876 } values %{ $self->{item} }; 3206 } values %{ $self->{item} };
2877 3207
3208 $self->{timer}->interval (1);
3209
2878 my $count = 10 + 1; 3210 my $count = 10 + 1;
2879 for my $item (@items) { 3211 for my $item (@items) {
2880 last unless --$count; 3212 last unless --$count;
2881 3213
2882 push @widgets, $item->{label} ||= do { 3214 my $label = $item->{label} ||= do {
2883 # TODO: doesn't handle markup well (read as: at all) 3215 # TODO: doesn't handle markup well (read as: at all)
2884 my $short = $item->{count} > 1 3216 my $short = $item->{count} > 1
2885 ? "<b>$item->{count} ×</b> $item->{text}" 3217 ? "<b>$item->{count} ×</b> $item->{text}"
2886 : $item->{text}; 3218 : $item->{text};
2887 3219
… …
2895 tooltip => $item->{tooltip}, 3227 tooltip => $item->{tooltip},
2896 tooltip_font => $::FONT_PROP, 3228 tooltip_font => $::FONT_PROP,
2897 tooltip_width => 0.67, 3229 tooltip_width => 0.67,
2898 fontsize => $item->{fontsize} || $self->{fontsize}, 3230 fontsize => $item->{fontsize} || $self->{fontsize},
2899 max_w => $::WIDTH * 0.44, 3231 max_w => $::WIDTH * 0.44,
2900 fg => $item->{fg}, 3232 fg => [@{ $item->{fg} }],
2901 can_events => 1, 3233 can_events => 1,
2902 can_hover => 1 3234 can_hover => 1
2903 }; 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;
2904 } 3248 }
2905 3249
2906 $self->clear; 3250 $self->clear;
2907 $self->SUPER::add (reverse @widgets); 3251 $self->SUPER::add (reverse @widgets);
2908} 3252}
… …
2913 $text =~ s/^\s+//; 3257 $text =~ s/^\s+//;
2914 $text =~ s/\s+$//; 3258 $text =~ s/\s+$//;
2915 3259
2916 return unless $text; 3260 return unless $text;
2917 3261
2918 my $timeout = time + ((delete $arg{timeout}) || 60); 3262 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2919 3263
2920 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3264 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2921 3265
2922 if (my $item = $self->{item}{$group}) { 3266 if (my $item = $self->{item}{$group}) {
2923 if ($item->{text} eq $text) { 3267 if ($item->{text} eq $text) {
2924 $item->{count}++; 3268 $item->{count}++;
2925 } else { 3269 } else {
2926 $item->{count} = 1; 3270 $item->{count} = 1;
2927 $item->{text} = $item->{tooltip} = $text; 3271 $item->{text} = $item->{tooltip} = $text;
2928 } 3272 }
2929 $item->{id} = ++$self->{id}; 3273 $item->{id} += 0.2;#d#
2930 $item->{timeout} = $timeout; 3274 $item->{timeout} = $timeout;
2931 delete $item->{label}; 3275 delete $item->{label};
2932 } else { 3276 } else {
2933 $self->{item}{$group} = { 3277 $self->{item}{$group} = {
2934 id => ++$self->{id}, 3278 id => ++$self->{id},
… …
2953 3297
2954 $self->reorder; 3298 $self->reorder;
2955 $self->SUPER::reconfigure; 3299 $self->SUPER::reconfigure;
2956} 3300}
2957 3301
3302sub destroy {
3303 my ($self) = @_;
3304
3305 $self->{timer}->cancel;
3306
3307 $self->SUPER::destroy;
3308}
3309
2958############################################################################# 3310#############################################################################
2959 3311
2960package CFClient::UI::Root; 3312package CFClient::UI::Inventory;
2961 3313
2962our @ISA = CFClient::UI::Container::; 3314our @ISA = CFClient::UI::ScrolledWindow::;
2963
2964use CFClient::OpenGL;
2965 3315
2966sub new { 3316sub new {
2967 my $class = shift; 3317 my $class = shift;
2968 3318
2969 $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 => [],
3561 @_,
3562 )
3563}
3564
3565my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3566
3567my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3568 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
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");
3577
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 {
3651 my ($self, $spell) = @_;
3652
3653 $self->{spell}->{$spell->{name}} = $spell;
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 (
2970 visible => 1, 3685 visible => 1,
2971 @_, 3686 @_,
2972 ) 3687 );
2973}
2974 3688
2975sub configure { 3689 Scalar::Util::weaken ($self->{root} = $self);
2976 my ($self, $x, $y, $w, $h) = @_;
2977 3690
2978 $self->{w} = $w; 3691 $self
2979 $self->{h} = $h;
2980}
2981
2982sub check_size {
2983 my ($self) = @_;
2984
2985 $self->size_allocate ($self->{w}, $self->{h})
2986 if $self->{w};
2987} 3692}
2988 3693
2989sub size_request { 3694sub size_request {
2990 my ($self) = @_; 3695 my ($self) = @_;
2991 3696
2992 ($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
2993} 3712}
2994 3713
2995sub size_allocate { 3714sub size_allocate {
2996 my ($self, $w, $h) = @_; 3715 my ($self, $w, $h) = @_;
2997 3716
2998 for my $child ($self->children) { 3717 for my $child ($self->children) {
2999 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)};
3000 3719
3001 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3720 $X = $child->{force_x} if exists $child->{force_x};
3002 if exists $child->{req_x}; 3721 $Y = $child->{force_y} if exists $child->{force_y};
3003 3722
3004 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3723 $X = _to_pixel $X, $W, $self->{w};
3005 if exists $child->{req_y}; 3724 $Y = _to_pixel $Y, $H, $self->{h};
3006
3007 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3008 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3009 3725
3010 $child->configure ($X, $Y, $W, $H); 3726 $child->configure ($X, $Y, $W, $H);
3011 } 3727 }
3012} 3728}
3013 3729
… …
3024} 3740}
3025 3741
3026sub update { 3742sub update {
3027 my ($self) = @_; 3743 my ($self) = @_;
3028 3744
3029 $self->check_size;
3030 $::WANT_REFRESH++; 3745 $::WANT_REFRESH++;
3031} 3746}
3032 3747
3033sub add { 3748sub add {
3034 my ($self, @children) = @_; 3749 my ($self, @children) = @_;
3035 3750
3036 for (my @widgets = @children; my $w = pop @widgets; ) {
3037 push @widgets, $w->children;
3038 $w->{root} = $self;
3039 $w->{visible} = $self->{visible} + 1;
3040 }
3041
3042 for my $child (@children) {
3043 $child->{is_toplevel} = 1; 3751 $_->{is_toplevel} = 1
3044 3752 for @children;
3045 # integerise window positions
3046 $child->{x} = int $child->{x};
3047 $child->{y} = int $child->{y};
3048 }
3049 3753
3050 $self->SUPER::add (@children); 3754 $self->SUPER::add (@children);
3051} 3755}
3052 3756
3053sub remove { 3757sub remove {
3054 my ($self, @children) = @_; 3758 my ($self, @children) = @_;
3055 3759
3056 $self->SUPER::remove (@children); 3760 $self->SUPER::remove (@children);
3761
3762 delete $self->{is_toplevel}
3763 for @children;
3057 3764
3058 while (@children) { 3765 while (@children) {
3059 my $w = pop @children; 3766 my $w = pop @children;
3060 push @children, $w->children; 3767 push @children, $w->children;
3061 $w->set_invisible; 3768 $w->set_invisible;
… …
3080 while ($self->{refresh_hook}) { 3787 while ($self->{refresh_hook}) {
3081 $_->() 3788 $_->()
3082 for values %{delete $self->{refresh_hook}}; 3789 for values %{delete $self->{refresh_hook}};
3083 } 3790 }
3084 3791
3085 if ($self->{check_size}) { 3792 if ($self->{realloc}) {
3086 my @queue = ([], []); 3793 my %queue;
3794 my @queue;
3795 my $widget;
3087 3796
3088 for (;;) { 3797 outer:
3089 if ($self->{check_size}) { 3798 while () {
3090 # heuristic: check containers last 3799 if (my $realloc = delete $self->{realloc}) {
3091 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3800 for $widget (values %$realloc) {
3092 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 }
3093 } 3807 }
3094 3808
3095 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3809 while () {
3810 @queue or last outer;
3096 3811
3097 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3812 $widget = pop @{ $queue[-1] || [] }
3098 ? @$widget{qw(user_w user_h)} 3813 and last;
3099 : $widget->size_request;
3100
3101 if (delete $widget->{force_alloc}
3102 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3103 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3104 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}) {
3105 $widget->{req_w} = $w; 3833 $widget->{req_w} = $w;
3106 $widget->{req_h} = $h; 3834 $widget->{req_h} = $h;
3107 3835
3108 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3836 $self->{size_alloc}{$widget+0} = $widget;
3109 3837
3110 $widget->{parent}->check_size
3111 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 }
3112 } 3845 }
3846
3847 delete $self->{realloc}{$widget+0};
3113 } 3848 }
3114 } 3849 }
3115 3850
3116 while ($self->{size_alloc}) { 3851 while (my $size_alloc = delete $self->{size_alloc}) {
3117 for (values %{delete $self->{size_alloc}}) { 3852 my @queue = sort { $b->{visible} <=> $a->{visible} }
3118 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)};
3119 3859
3120 $w = 0 if $w < 0; 3860 $w = 0 if $w < 0;
3121 $h = 0 if $h < 0; 3861 $h = 0 if $h < 0;
3122 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
3123 $widget->{w} = $w; 3870 $widget->{w} = $w;
3124 $widget->{h} = $h; 3871 $widget->{h} = $h;
3872
3125 $widget->emit (size_allocate => $w, $h); 3873 $widget->emit (size_allocate => $w, $h);
3874 }
3126 } 3875 }
3127 } 3876 }
3128 3877
3129 while ($self->{post_alloc_hook}) { 3878 while ($self->{post_alloc_hook}) {
3130 $_->() 3879 $_->()
3131 for values %{delete $self->{post_alloc_hook}}; 3880 for values %{delete $self->{post_alloc_hook}};
3132 } 3881 }
3882
3133 3883
3134 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3884 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3135 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3885 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3136 glClear GL_COLOR_BUFFER_BIT; 3886 glClear GL_COLOR_BUFFER_BIT;
3137 3887
… …
3139 glLoadIdentity; 3889 glLoadIdentity;
3140 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3890 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3141 glMatrixMode GL_MODELVIEW; 3891 glMatrixMode GL_MODELVIEW;
3142 glLoadIdentity; 3892 glLoadIdentity;
3143 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
3144 $self->_draw; 3901 $self->_draw;
3145} 3902}
3146 3903
3147############################################################################# 3904#############################################################################
3148 3905

Diff Legend

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