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.238 by root, Thu May 25 21:48:22 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 2006 UTC

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

Diff Legend

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