ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
399 542
400sub draw { 543sub draw {
401 my ($self) = @_; 544 my ($self) = @_;
402 545
403 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
404 557
405 glPushMatrix; 558 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 560
410 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 563 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 565 glBegin GL_QUADS;
417 glVertex $x , $y; 566 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
421 glEnd; 570 glEnd;
422 glDisable GL_BLEND; 571 glDisable GL_BLEND;
423 } 572 }
424 573
425 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 575 glPushMatrix;
427 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 579 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
434 glEnd; 583 glEnd;
435 glPopMatrix; 584 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
438} 590}
439 591
440sub _draw { 592sub _draw {
441 my ($self) = @_; 593 my ($self) = @_;
442 594
443 warn "no draw defined for $self\n"; 595 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} 596}
505 597
506sub DESTROY { 598sub DESTROY {
507 my ($self) = @_; 599 my ($self) = @_;
508 600
… …
540 632
541 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
542 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
543 635
544 glEnable GL_BLEND; 636 glEnable GL_BLEND;
545 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
546 glColor @$color; 638 glColor_premultiply @$color;
547 639
548 glBegin GL_QUADS; 640 glBegin GL_QUADS;
549 glVertex 0 , 0; 641 glVertex 0 , 0;
550 glVertex 0 , $h; 642 glVertex 0 , $h;
551 glVertex $w, $h; 643 glVertex $w, $h;
… …
566 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
567 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
568} 660}
569 661
570sub size_request { 662sub size_request {
571 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
572} 666}
573 667
574sub draw { } 668sub draw { }
575 669
576############################################################################# 670#############################################################################
… …
580our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
581 675
582sub new { 676sub new {
583 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
584 678
585 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
586 680
587 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
588 children => [], 682 children => [],
589 can_events => 0, 683 can_events => 0,
590 %arg, 684 %arg,
591 ); 685 );
686
592 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
593 689
594 $self 690 $self
595} 691}
596 692
597sub add { 693sub add {
… …
605 $self->{children} = [ 701 $self->{children} = [
606 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
607 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
608 ]; 704 ];
609 705
610 $self->check_size (1); 706 $self->realloc;
611 $self->update;
612} 707}
613 708
614sub children { 709sub children {
615 @{ $_[0]{children} } 710 @{ $_[0]{children} }
616} 711}
… …
621 delete $child->{parent}; 716 delete $child->{parent};
622 $child->hide; 717 $child->hide;
623 718
624 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
625 720
626 $self->check_size (1); 721 $self->realloc;
627 $self->update;
628} 722}
629 723
630sub clear { 724sub clear {
631 my ($self) = @_; 725 my ($self) = @_;
632 726
… …
636 for (@$children) { 730 for (@$children) {
637 delete $_->{parent}; 731 delete $_->{parent};
638 $_->hide; 732 $_->hide;
639 } 733 }
640 734
641 $self->check_size; 735 $self->realloc;
642 $self->update;
643} 736}
644 737
645sub find_widget { 738sub find_widget {
646 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
647 740
648 $x -= $self->{x}; 741 $x -= $self->{x};
649 $y -= $self->{y}; 742 $y -= $self->{y};
650 743
651 my $res; 744 my $res;
652 745
653 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
654 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
655 and return $res; 748 and return $res;
656 } 749 }
657 750
658 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
707 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
708} 801}
709 802
710############################################################################# 803#############################################################################
711 804
805# back-buffered drawing area
806
712package CFClient::UI::Window; 807package CFClient::UI::Window;
713 808
714our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
715 810
716use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
734 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
735 $self->update; 830 $self->update;
736} 831}
737 832
738sub _render { 833sub _render {
834 my ($self) = @_;
835
739 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
740} 837}
741 838
742sub render_child { 839sub render_child {
743 my ($self) = @_; 840 my ($self) = @_;
744 841
745 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
746 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
747 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
748 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
749 $self->_render; 853 $self->_render;
750 }; 854 };
751} 855}
752 856
753sub _draw { 857sub _draw {
754 my ($self) = @_; 858 my ($self) = @_;
755 859
756 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
757 861
758 my $tex = $self->{texture} 862 my $tex = $self->{texture}
759 or return; 863 or return;
760 864
761 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
762 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
763 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
764 868
765 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
766 870
767 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
768} 872}
… …
784} 888}
785 889
786sub size_request { 890sub size_request {
787 my ($self) = @_; 891 my ($self) = @_;
788 892
789 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
790 894
791 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
792} 899}
793 900
794sub size_allocate { 901sub size_allocate {
795 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
796 903
904 my $child = $self->child;
905
797 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
798 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
799 908
800 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
801 $self->update; 910 $self->update;
802} 911}
803 912
… …
839} 948}
840 949
841sub _render { 950sub _render {
842 my ($self) = @_; 951 my ($self) = @_;
843 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
844 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
845 957
846 $self->SUPER::_render; 958 $self->SUPER::_render;
847} 959}
848 960
… …
851package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
852 964
853our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
854 966
855sub new { 967sub new {
856 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
857 971
858 my $self; 972 my $self;
859 973
860 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
861 vertical => 1, 975 vertical => 1,
862 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
863 connect_changed => sub { 977 on_changed => sub {
864 $self->{vp}->set_offset (0, $_[1]); 978 $self->{vp}->set_offset (0, $_[1]);
865 }, 979 },
866 ; 980 ;
867 981
868 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
869 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
870 slider => $slider, 984 slider => $slider,
871 @_, 985 %arg,
872 ); 986 );
873 987
874 $self->{vp}->add ($self->{scrolled});
875 $self->add ($self->{vp});
876 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
877 990
878 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
879} 998}
880 999
881sub update { 1000sub update {
882 my ($self) = @_; 1001 my ($self) = @_;
883 1002
… …
922 1041
923 if ($self->{bg}) { 1042 if ($self->{bg}) {
924 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
925 1044
926 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
927 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
928 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
929 1048
930 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
931 glVertex 0 , 0; 1050 glVertex 0 , 0;
932 glVertex 0 , $h; 1051 glVertex 0 , $h;
933 glVertex $w, $h; 1052 glVertex $w, $h;
… …
946 1065
947our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
948 1067
949use CFClient::OpenGL; 1068use CFClient::OpenGL;
950 1069
951my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
952 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
953 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
954 1077
955sub new { 1078sub new {
956 my $class = shift; 1079 my ($class, %arg) = @_;
957 1080
958 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
959 1082
960 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
961 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
962 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
963 border => 0.6, 1086 border => 0.6,
964 is_toplevel => 1,
965 can_events => 1, 1087 can_events => 1,
966 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
967 ); 1091 );
968 1092
969 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
970 align => 0, 1094 align => 0,
971 valign => 1, 1095 valign => 1,
972 text => $self->{title}, 1096 text => $title,
973 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
974 1099
975 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
976} 1108}
977 1109
978sub border { 1110sub border {
979 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
980} 1112}
981 1113
982sub size_request { 1114sub size_request {
983 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
984 1119
985 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
986 1121
987 ( 1122 (
988 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
991} 1126}
992 1127
993sub size_allocate { 1128sub size_allocate {
994 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
995 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
996 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
997 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
998 1141
999 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1000 if $self->{title};
1001
1002 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
1003} 1143}
1004 1144
1005sub button_down { 1145sub button_down {
1006 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1007 1147
… …
1023 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1024 1164
1025 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1026 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1027 1167
1028 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1029 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
1030 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1031 $self->check_size; 1172 $self->realloc;
1032 }; 1173 };
1033 1174
1034 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1035 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1036 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1038 $self->{motion} = sub { 1179 $self->{motion} = sub {
1039 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1040 1181
1041 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1042 1183
1043 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1044 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1045 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1046 } 1192 1
1047} 1193}
1048 1194
1049sub button_up { 1195sub button_up {
1050 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1051 1197
1052 delete $self->{motion}; 1198 !!delete $self->{motion}
1053} 1199}
1054 1200
1055sub mouse_motion { 1201sub mouse_motion {
1056 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1057 1203
1058 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1059} 1207}
1060 1208
1061sub _draw { 1209sub _draw {
1062 my ($self) = @_; 1210 my ($self) = @_;
1063 1211
1212 my $child = $self->{children}[0];
1213
1064 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1065 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1066 1216
1067 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1068 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1069 1219
1070 my $border = $self->border; 1220 my $border = $self->border;
1071 1221
1072 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1073 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1074 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1075 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1076 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1077 1227
1078 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1079 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1080 1230
1081 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1082 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1083 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1084
1085 glColor @{ $self->{bg} };
1086
1087 $bg->{s} = $rep_x;
1088 $bg->{t} = $rep_y;
1089 $bg->{wrap_mode} = 1;
1090 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1091 } 1236 }
1092 1237
1093 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1094 1239
1095 $self->{title}->draw if $self->{title};
1096
1097 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1098} 1246}
1099 1247
1100############################################################################# 1248#############################################################################
1101 1249
1102package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1124 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1125 1273
1126 $child->set_parent ($self); 1274 $child->set_parent ($self);
1127 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1128 1276
1129 $self->check_size (1); 1277 $self->realloc;
1130} 1278}
1131 1279
1132# TODO: move to container class maybe? send children a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1133sub clear { 1281sub clear {
1134 my ($self) = @_; 1282 my ($self) = @_;
… …
1139 for (@children) { 1287 for (@children) {
1140 delete $_->{parent}; 1288 delete $_->{parent};
1141 $_->hide; 1289 $_->hide;
1142 } 1290 }
1143 1291
1144 $self->check_size (1); 1292 $self->realloc;
1145 $self->update;
1146} 1293}
1147 1294
1148sub get_wh { 1295sub get_wh {
1149 my ($self) = @_; 1296 my ($self) = @_;
1150 1297
… …
1246 } 1393 }
1247} 1394}
1248 1395
1249############################################################################# 1396#############################################################################
1250 1397
1251package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1252
1253# TODO: wrap into common Box base class
1254 1399
1255our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1256 1401
1257sub size_request { 1402sub size_request {
1258 my ($self) = @_; 1403 my ($self) = @_;
1259 1404
1260 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1261 1406 ? (
1262 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1263 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1264 (List::Util::max map $_->[1], @alloc), 1409 )
1265 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1266} 1414}
1267 1415
1268sub size_allocate { 1416sub size_allocate {
1269 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1270 1418
1271 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1272
1273 my $children = $self->{children}; 1420 my $children = $self->{children};
1274 1421
1275 my @h = map $_->{req_w}, @$children; 1422 my @req;
1276 1423
1277 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1278 1425 @req = ($space / (@$children || 1)) x @$children;
1279 if ($req_h > $h) {
1280 # ah well, not enough space
1281 $_ *= $h / $req_h for @h;
1282 } else { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1283 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1284 $exp ||= 1;
1285 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1286 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1287 my $child = $children->[$_];
1288
1289 my $alloc_h = $h[$_];
1290 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1291 $h[$_] = $alloc_h;
1292 } 1440 }
1293 } 1441 }
1294 1442
1295 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1296 1444
1297 my $y = 0; 1445 my $pos = 0;
1298 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1299 my $child = $children->[$_];
1300 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1301 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1302 1449
1303 $y += $h; 1450 $pos += $alloc;
1304 } 1451 }
1305 1452
1306 1 1453 1
1307} 1454}
1308 1455
1309############################################################################# 1456#############################################################################
1310 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1311package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1312 1474
1313# TODO: wrap into common Box base class
1314
1315our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1316 1476
1317sub size_request { 1477sub new {
1318 my ($self) = @_; 1478 my $class = shift;
1319 1479
1320 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1321 1481 vertical => 1,
1322 ( 1482 @_,
1323 (List::Util::max map $_->[0], @alloc),
1324 (List::Util::sum map $_->[1], @alloc),
1325 ) 1483 )
1326}
1327
1328sub size_allocate {
1329 my ($self, $w, $h) = @_;
1330
1331 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1332
1333 my $children = $self->{children};
1334
1335 my @h = map $_->{req_h}, @$children;
1336
1337 my $req_h = List::Util::sum @h;
1338
1339 if ($req_h > $h) {
1340 # ah well, not enough space
1341 $_ *= $h / $req_h for @h;
1342 } else {
1343 my $exp = List::Util::sum map $_->{expand}, @$children;
1344 $exp ||= 1;
1345
1346 for (0 .. $#$children) {
1347 my $child = $children->[$_];
1348
1349 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1350 }
1351 }
1352
1353 CFClient::UI::harmonize \@h;
1354
1355 my $y = 0;
1356 for (0 .. $#$children) {
1357 my $child = $children->[$_];
1358 my $h = $h[$_];
1359 $child->configure (0, $y, $w, $h);
1360
1361 $y += $h;
1362 }
1363
1364 1
1365} 1484}
1366 1485
1367############################################################################# 1486#############################################################################
1368 1487
1369package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1386 ellipsise => 3, # end 1505 ellipsise => 3, # end
1387 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1388 fontsize => 1, 1507 fontsize => 1,
1389 align => -1, 1508 align => -1,
1390 valign => -1, 1509 valign => -1,
1391 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1392 can_events => 0, 1512 can_events => 0,
1393 %arg 1513 %arg
1394 ); 1514 );
1395 1515
1396 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1423 1543
1424 delete $self->{texture}; 1544 delete $self->{texture};
1425 $self->SUPER::update; 1545 $self->SUPER::update;
1426} 1546}
1427 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1428sub set_text { 1555sub set_text {
1429 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1430 1557
1431 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1432 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1433 1560
1434 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1435 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1436 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1437 $self->update; 1566 $self->update;
1438 $self->check_size;
1439} 1567}
1440 1568
1441sub set_markup { 1569sub set_markup {
1442 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1443 1571
… …
1447 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1448 1576
1449 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1450 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1451 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1452 $self->update; 1582 $self->update;
1453 $self->check_size;
1454} 1583}
1455 1584
1456sub size_request { 1585sub size_request {
1457 my ($self) = @_; 1586 my ($self) = @_;
1458 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1459 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1460 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1461 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1462 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1463 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1464 1596
1465 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1466 1598
1467 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1468 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1469 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1470 1602
1471 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1472 1604
1473 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1474 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1475 } 1607 }
1476 1608
1609 ($w, $h)
1477 ( 1610 }
1478 $w + $self->{padding} * 2,
1479 $h + $self->{padding} * 2,
1480 )
1481} 1611}
1482 1612
1483sub size_allocate { 1613sub size_allocate {
1484 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1485 1615
1616 delete $self->{ox};
1617
1486 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1487} 1620}
1488 1621
1489sub set_fontsize { 1622sub set_fontsize {
1490 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1491 1624
1492 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1493 delete $self->{texture}; 1626 delete $self->{texture};
1494 1627
1495 $self->update; 1628 $self->realloc;
1496 $self->check_size;
1497} 1629}
1498 1630
1499sub _draw { 1631sub _draw {
1500 my ($self) = @_; 1632 my ($self) = @_;
1501 1633
… …
1507 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1508 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1509 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1510 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1511 1643
1512 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1513 1646
1647 unless (exists $self->{ox}) {
1514 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1515 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1516 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1517 1651
1518 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1519 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1520 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1521
1522 $tex
1523 }; 1655 };
1524 1656
1525 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1526 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1527 1658
1528 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1529 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1530 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1531 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1532 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1533 } 1666 }
1534 1667
1535 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1536} 1669}
… …
1565 1698
1566 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1567 1700
1568 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1569 1702
1570 delete $self->{texture};
1571
1572 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1573 $self->{text} = $text; 1704 $self->{text} = $text;
1574 1705
1575 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1576 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1577 1709
1578 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1579} 1714}
1580 1715
1581sub set_text { 1716sub set_text {
1582 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1583 1718
1584 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1585 $self->_set_text ($text); 1720 $self->_set_text ($text);
1586 $self->update;
1587 $self->check_size;
1588} 1721}
1589 1722
1590sub get_text { 1723sub get_text {
1591 $_[0]{text} 1724 $_[0]{text}
1592} 1725}
… …
1622 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1623 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1624 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1625 } elsif ($uni) { 1758 } elsif ($uni) {
1626 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1627 } 1762 }
1628 1763
1629 $self->_set_text ($text); 1764 $self->_set_text ($text);
1630 $self->update; 1765
1631 $self->check_size; 1766 $self->realloc;
1767
1768 1
1632} 1769}
1633 1770
1634sub focus_in { 1771sub focus_in {
1635 my ($self) = @_; 1772 my ($self) = @_;
1636 1773
… …
1651 utf8::encode $text; 1788 utf8::encode $text;
1652 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1653 1790
1654 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1655 $self->update; 1792 $self->update;
1793
1794 1
1656} 1795}
1657 1796
1658sub mouse_motion { 1797sub mouse_motion {
1659 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1660# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1661} 1802}
1662 1803
1663sub _draw { 1804sub _draw {
1664 my ($self) = @_; 1805 my ($self) = @_;
1665 1806
1666 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1667 1808
1668 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1669 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1670 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1671 } else { 1812 } else {
1672 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1673 } 1814 }
1674 1815
1675 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1677 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1678 glVertex 0 , 0; 1819 glVertex 0 , 0;
1679 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1680 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1681 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1742 } else { 1883 } else {
1743 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1744 } 1885 }
1745 1886
1746 } else { 1887 } else {
1747 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1748 } 1891 1
1749
1750} 1892}
1751 1893
1752############################################################################# 1894#############################################################################
1753 1895
1754package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1763 1905
1764sub new { 1906sub new {
1765 my $class = shift; 1907 my $class = shift;
1766 1908
1767 $class->SUPER::new ( 1909 $class->SUPER::new (
1768 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1769 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1770 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1771 can_hover => 1, 1914 can_hover => 1,
1772 align => 0, 1915 align => 0,
1773 valign => 0, 1916 valign => 0,
… …
1782 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1783 1926
1784 $self->emit ("activate") 1927 $self->emit ("activate")
1785 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1786 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1787} 1932}
1788 1933
1789sub _draw { 1934sub _draw {
1790 my ($self) = @_; 1935 my ($self) = @_;
1791 1936
1792 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1793
1794 if ($GRAB == $self) {
1795 $self->{fg} = $self->{active_fg};
1796 }
1797 1938
1798 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1800 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1801 1942
… …
1820 1961
1821sub new { 1962sub new {
1822 my $class = shift; 1963 my $class = shift;
1823 1964
1824 $class->SUPER::new ( 1965 $class->SUPER::new (
1825 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1826 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1827 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1828 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1829 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1830 state => 0, 1972 state => 0,
… …
1834} 1976}
1835 1977
1836sub size_request { 1978sub size_request {
1837 my ($self) = @_; 1979 my ($self) = @_;
1838 1980
1839 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1840} 1982}
1841 1983
1842sub button_down { 1984sub button_down {
1843 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1844 1986
1845 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1846 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1847 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1848 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1849 } 1995 1
1850} 1996}
1851 1997
1852sub _draw { 1998sub _draw {
1853 my ($self) = @_; 1999 my ($self) = @_;
1854 2000
1855 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1856 2002
1857 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1858 2004
1859 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1860 2008
1861 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1862 2010
1863 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1864 2012
… …
2019 2167
2020 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2021 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2022 2170
2023 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2024 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2025 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2026 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2027 2176
2028 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2029 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2129 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2130 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2131 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2132 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2133 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2134 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2135 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2136 vertical => 0, 2285 vertical => 0,
2137 can_hover => 1, 2286 can_hover => 1,
2138 inner_pad => 0.02, 2287 inner_pad => 0.02,
2139 @_ 2288 @_
2140 ); 2289 );
… …
2143 $self->update; 2292 $self->update;
2144 2293
2145 $self 2294 $self
2146} 2295}
2147 2296
2297sub changed { }
2298
2148sub set_range { 2299sub set_range {
2149 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2150 2301
2151 ($range, $self->{range}) = ($self->{range}, $range); 2302 ($range, $self->{range}) = ($self->{range}, $range);
2152 2303
… …
2178} 2329}
2179 2330
2180sub size_request { 2331sub size_request {
2181 my ($self) = @_; 2332 my ($self) = @_;
2182 2333
2183 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2184 my $h = $self->{req_h};
2185
2186 $self->{vertical} ? ($h, $w) : ($w, $h)
2187} 2335}
2188 2336
2189sub button_down { 2337sub button_down {
2190 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2191 2339
2192 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2193 2341
2194 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2195 2343
2196 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2197} 2345}
2198 2346
2199sub mouse_motion { 2347sub mouse_motion {
2200 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2201 2349
… …
2205 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2206 2354
2207 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2208 2356
2209 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2210 } 2362 1
2211} 2363}
2212 2364
2213sub update { 2365sub update {
2214 my ($self) = @_; 2366 my ($self) = @_;
2215 2367
2216 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2217 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2218 2377
2219 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2220 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2221 2380
… …
2227 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2228 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2229 2388
2230 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2231 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2232 }); 2391 }
2233
2234 $self->SUPER::update;
2235}
2236
2237sub _draw {
2238 my ($self) = @_;
2239 2392
2240 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2241 2394
2242 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2243 2396
… …
2437 2590
2438 delete $self->{texture}; 2591 delete $self->{texture};
2439 } 2592 }
2440 2593
2441 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2442 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2443 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2444 2597
2445 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2446 2599
2447 my $y0 = $top; 2600 my $y0 = $top;
… …
2482sub _draw { 2635sub _draw {
2483 my ($self) = @_; 2636 my ($self) = @_;
2484 2637
2485 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2488 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2489 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2490 2643
2491 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2492 2645
2493} 2646}
… …
2542 2695
2543sub new { 2696sub new {
2544 my $class = shift; 2697 my $class = shift;
2545 2698
2546 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2547 state => 0, 2700 state => 0,
2548 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2549 @_ 2702 @_
2550 ); 2703 );
2551 2704
2552 if ($self->{state}) {
2553 $self->{state} = 0;
2554 $self->toggle_flopper;
2555 }
2556
2557 $self 2705 $self
2558} 2706}
2559 2707
2560sub toggle_flopper { 2708sub toggle_flopper {
2561 my ($self) = @_; 2709 my ($self) = @_;
2562 2710
2563 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2564 if ($self->{state} = !$self->{state}) {
2565 $CFClient::UI::ROOT->add ($self->{other});
2566 $self->{other}->move ($self->coord2global (0, $self->{h}));
2567 $self->_emit ("open");
2568 } else {
2569 $CFClient::UI::ROOT->remove ($self->{other});
2570 $self->_emit ("close");
2571 }
2572
2573 $self->_emit (changed => $self->{state});
2574} 2712}
2575 2713
2576############################################################################# 2714#############################################################################
2577 2715
2578package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2591} 2729}
2592 2730
2593sub set_tooltip_from { 2731sub set_tooltip_from {
2594 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2595 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2596 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2597 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2598 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2599 fontsize => 0.8, 2746 fontsize => 0.8,
2600 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2601 ellipsise => 0, 2748 ellipsise => 0,
2602 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2613 2760
2614sub size_allocate { 2761sub size_allocate {
2615 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2616 2763
2617 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2618} 2783}
2619 2784
2620sub _draw { 2785sub _draw {
2621 my ($self) = @_; 2786 my ($self) = @_;
2622 2787
… …
2639 glVertex $w, $h; 2804 glVertex $w, $h;
2640 glVertex $w, 0; 2805 glVertex $w, 0;
2641 glEnd; 2806 glEnd;
2642 2807
2643 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2644 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2645} 2811}
2646 2812
2647############################################################################# 2813#############################################################################
2648 2814
… …
2707 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2708 2874
2709 if ($tex) { 2875 if ($tex) {
2710 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2711 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2712 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2713 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2714 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2715 } 2881 }
2716} 2882}
2717 2883
… …
2724 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2725} 2891}
2726 2892
2727############################################################################# 2893#############################################################################
2728 2894
2729package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2730 2896
2731our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2732 2898
2733sub new { 2899# TODO: should actualyl wrap buttons and other goodies.
2734 my $class = shift;
2735
2736 my $self = $class->SUPER::new (
2737 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2738 @_,
2739 );
2740
2741 $self
2742}
2743
2744sub set_items {
2745 my ($self, $items) = @_;
2746
2747 $self->{scrolled}->clear;
2748 return unless $items;
2749
2750 my @items = sort {
2751 ($a->{type} <=> $b->{type})
2752 or ($a->{name} cmp $b->{name})
2753 } @$items;
2754
2755 $self->{real_items} = \@items;
2756
2757 my $row = 0;
2758 for my $item (@items) {
2759 CFClient::Item::update_widgets $item;
2760
2761 $self->{scrolled}->add (0, $row, $item->{face_widget});
2762 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2763 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2764
2765 $row++;
2766 }
2767}
2768
2769sub size_request {
2770 my ($self) = @_;
2771 ($self->{req_w}, $self->{req_h});
2772}
2773 2900
2774############################################################################# 2901#############################################################################
2775 2902
2776package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2777 2904
… …
2818 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2819 $GRAB = $self; 2946 $GRAB = $self;
2820 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2821 2948
2822 $self->show; 2949 $self->show;
2823 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2824} 2951}
2825 2952
2826sub mouse_motion { 2953sub mouse_motion {
2827 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2828 2955
2829 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2830 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2831 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2832} 2961}
2833 2962
2834sub button_up { 2963sub button_up {
2835 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2836 2965
… …
2838 undef $GRAB; 2967 undef $GRAB;
2839 $self->hide; 2968 $self->hide;
2840 2969
2841 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2842 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2843 } 2976 1
2844} 2977}
2845 2978
2846############################################################################# 2979#############################################################################
2847 2980
2848package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2849 2982
2850our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2851 2984
2852sub new { 2985sub new {
2853 my $class = shift; 2986 my $class = shift;
2854 2987
2855 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2856 fontsize => 0.8, 3097 fontsize => 0.8,
2857 @_, 3098 @_,
2858 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2859} 3106}
2860 3107
2861sub reorder { 3108sub reorder {
2862 my ($self) = @_; 3109 my ($self) = @_;
2863 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2864 3116
2865 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2866 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2867 } 3119 }
2868 3120
… …
2871 my @items = sort { 3123 my @items = sort {
2872 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2873 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2874 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2875 3127
3128 $self->{timer}->interval (1);
3129
2876 my $count = 10 + 1; 3130 my $count = 10 + 1;
2877 for my $item (@items) { 3131 for my $item (@items) {
2878 last unless --$count; 3132 last unless --$count;
2879 3133
2880 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2881 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2882 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2883 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2884 : $item->{text}; 3138 : $item->{text};
2885 3139
… …
2893 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2894 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2895 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2896 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2897 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2898 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2899 can_events => 1, 3153 can_events => 1,
2900 can_hover => 1 3154 can_hover => 1
2901 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2902 } 3168 }
2903 3169
2904 $self->clear; 3170 $self->clear;
2905 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2906} 3172}
… …
2911 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2912 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2913 3179
2914 return unless $text; 3180 return unless $text;
2915 3181
2916 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2917 3183
2918 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2919 3185
2920 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2921 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2951 3217
2952 $self->reorder; 3218 $self->reorder;
2953 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2954} 3220}
2955 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2956############################################################################# 3230#############################################################################
2957 3231
2958package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2959 3233
2960our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2961
2962use CFClient::OpenGL;
2963 3235
2964sub new { 3236sub new {
2965 my $class = shift; 3237 my $class = shift;
2966 3238
2967 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
2968 @_, 3481 @_,
2969 ) 3482 )
2970} 3483}
2971 3484
2972sub configure { 3485# XXX: Do sorting? Argl...
2973 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2974
2975 $self->{w} = $w;
2976 $self->{h} = $h;
2977}
2978
2979sub check_size {
2980 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2981 3489
2982 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2983 if $self->{w}; 3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3539 visible => 1,
3540 @_,
3541 );
3542
3543 Scalar::Util::weaken ($self->{root} = $self);
3544
3545 $self
2984} 3546}
2985 3547
2986sub size_request { 3548sub size_request {
2987 my ($self) = @_; 3549 my ($self) = @_;
2988 3550
2989 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
2990} 3566}
2991 3567
2992sub size_allocate { 3568sub size_allocate {
2993 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2994 3570
2995 for my $child ($self->children) { 3571 for my $child ($self->children) {
2996 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2997 3573
2998 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
2999 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3000 3576
3001 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3002 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
3003
3004 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3005 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3006 3579
3007 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3008 } 3581 }
3009} 3582}
3010 3583
… …
3021} 3594}
3022 3595
3023sub update { 3596sub update {
3024 my ($self) = @_; 3597 my ($self) = @_;
3025 3598
3026 $self->check_size;
3027 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3028} 3600}
3029 3601
3030sub add { 3602sub add {
3031 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3032 3604
3033 for (my @widgets = @children; my $w = pop @widgets; ) {
3034 push @widgets, $w->children;
3035 $w->{root} = $self;
3036 $w->{visible} = 1;
3037 }
3038
3039 for my $child (@children) {
3040 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3041 3606 for @children;
3042 # integerise window positions
3043 $child->{x} = int $child->{x};
3044 $child->{y} = int $child->{y};
3045 }
3046 3607
3047 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3048} 3609}
3049 3610
3050sub remove { 3611sub remove {
3051 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3052 3613
3053 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3054 3618
3055 while (@children) { 3619 while (@children) {
3056 my $w = pop @children; 3620 my $w = pop @children;
3057 push @children, $w->children; 3621 push @children, $w->children;
3058 $w->set_invisible; 3622 $w->set_invisible;
… …
3077 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3078 $_->() 3642 $_->()
3079 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3080 } 3644 }
3081 3645
3082 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3083 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3084 3650
3085 for (;;) { 3651 outer:
3086 if ($self->{check_size}) { 3652 while () {
3087 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3088 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3089 for values %{delete $self->{check_size}} 3655 $widget->{visible} or next; # do not resize invisible widgets
3656
3657 $queue{$widget+0}++ and next; # duplicates are common
3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3090 } 3661 }
3091 3662
3092 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3093 3665
3094 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3095 ? @$widget{qw(user_w user_h)} 3667 and last;
3096 : $widget->size_request;
3097
3098 if (delete $widget->{force_alloc}
3099 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3100 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3101 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3102 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3103 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3104 3689
3105 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3106 3691
3107 $widget->{parent}->check_size
3108 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3109 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3110 } 3702 }
3111 } 3703 }
3112 3704
3113 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3114 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3115 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3116 3713
3117 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3118 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3119 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3120 $widget->{w} = $w; 3724 $widget->{w} = $w;
3121 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3122 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3123 } 3729 }
3124 } 3730 }
3125 3731
3126 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3127 $_->() 3733 $_->()
3128 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3129 } 3735 }
3736
3130 3737
3131 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3132 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3133 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3134 3741
… …
3136 glLoadIdentity; 3743 glLoadIdentity;
3137 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3138 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3139 glLoadIdentity; 3746 glLoadIdentity;
3140 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3141 $self->_draw; 3755 $self->_draw;
3142} 3756}
3143 3757
3144############################################################################# 3758#############################################################################
3145 3759

Diff Legend

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