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.240 by root, Fri May 26 18:28:23 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;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
13 14
15our $LAYOUT;
14our $ROOT; 16our $ROOT;
15our $TOOLTIP; 17our $TOOLTIP;
16our $BUTTON_STATE; 18our $BUTTON_STATE;
17 19
18our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
19 21
20sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
21 if (!$GRAB) { 23 if (!$GRAB) {
22 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
23 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
24
25 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
26 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
27 32
28 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
29 34
30 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
31 36
32 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
33 $TOOLTIP->show; 38 $TOOLTIP->show;
34
35 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
36
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
38 if $x + $TOOLTIP->{w} > $::WIDTH;
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 39 }
44 40
45 return; 41 return;
46 } 42 }
47 } 43 }
48 } 44 }
49 45
50 $TOOLTIP->hide; 46 $TOOLTIP->hide;
51 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
52} 71}
53 72
54# class methods for events 73# class methods for events
55sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
70 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
71 90
72 $GRAB = $widget; 91 $GRAB = $widget;
73 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
74 93
75 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
76 } 95 }
77 96
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 98
80 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
95 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
96 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
97 $grab->update if $grab; 116 $grab->update if $grab;
98 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
99 118
100 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
101 } 120 }
102} 121}
103 122
104sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
105 my ($ev) = @_; 124 my ($ev) = @_;
… …
111 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
112 131
113 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
114 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
115 134
116 check_tooltip; 135 $TOOLTIP_WATCHER->start;
117 } 136 }
118 137
119 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
120 if $HOVER; 139 if $HOVER;
121} 140}
… …
153sub rescale_widgets { 172sub rescale_widgets {
154 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
155 174
156 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
157 if ($widget->{is_toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167 } 191 }
168 192
169 reconfigure_widgets; 193 reconfigure_widgets;
170} 194}
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
206 %$self = (); 244 %$self = ();
207} 245}
208 246
209sub show { 247sub show {
210 my ($self) = @_; 248 my ($self) = @_;
249
211 return if $self->{parent}; 250 return if $self->{parent};
212 251
213 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
214} 253}
215 254
216sub show_centered { 255sub set_visible {
217 my ($self) = @_; 256 my ($self) = @_;
257
218 return if $self->{parent}; 258 return if $self->{visible};
219 259
220 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
221 262
222 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
223 "centered $self" => sub { 264
224 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
225 }, 266
226 ); 267 $_->set_visible for $self->children;
227} 268}
228 269
229sub set_invisible { 270sub set_invisible {
230 my ($self) = @_; 271 my ($self) = @_;
231 272
232 # broken show/hide model 273 return unless $self->{visible};
233 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
234 delete $self->{visible}; 278 delete $self->{visible};
235 279
236 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
237 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
238 282
239 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
240 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
241 285
242 $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;
243} 306}
244 307
245sub hide { 308sub hide {
246 my ($self) = @_; 309 my ($self) = @_;
247 310
… …
249 312
250 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
251 if $self->{parent}; 314 if $self->{parent};
252} 315}
253 316
254sub move { 317sub move_abs {
255 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
256 319
257 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
258 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
259 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
260 323
261 $self->update; 324 $self->update;
262} 325}
263 326
264sub set_size { 327sub set_size {
265 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
266 329
267 $self->{user_w} = $w; 330 $self->{force_w} = $w;
268 $self->{user_h} = $h; 331 $self->{force_h} = $h;
269 332
270 $self->check_size; 333 $self->realloc;
271} 334}
272 335
273sub size_request { 336sub size_request {
274 require Carp; 337 require Carp;
275 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
277 340
278sub configure { 341sub configure {
279 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
280 343
281 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
282 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
283 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
284 349
285 # use alignment to adjust x, y 350 # use alignment to adjust x, y
286 351
287 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
288 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
289
290 ($w, $h) = ($w2, $h2);
291 } 354 }
292 355
293 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
294 $self->{x} = $x; 357 $self->{x} = $x;
295 $self->{y} = $y; 358 $self->{y} = $y;
296 $self->update; 359 $self->update;
297 } 360 }
298 361
299 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
300 $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;
301 } 369 }
302} 370}
303 371
304sub size_allocate { 372sub size_allocate {
305 # nothing to be done 373 # nothing to be done
306} 374}
307 375
308sub reconfigure {
309 my ($self) = @_;
310
311 $self->check_size (1);
312 $self->update;
313}
314
315sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
316} 382}
317 383
318sub set_max_size { 384sub set_max_size {
319 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
320 386
321 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
322 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
323} 391}
324 392
325sub set_tooltip { 393sub set_tooltip {
326 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
327 395
… …
332 400
333 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
334 402
335 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
336 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
337 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
338 } 406 }
339} 407}
340 408
341# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
342sub coord2local { 410sub coord2local {
… …
379 447
380 $::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
381 unless $FOCUS; 449 unless $FOCUS;
382} 450}
383 451
384sub mouse_motion { } 452sub mouse_motion { 0 }
385sub button_up { } 453sub button_up { 0 }
386sub key_down { } 454sub key_down { 0 }
387sub key_up { } 455sub key_up { 0 }
388 456
389sub button_down { 457sub button_down {
390 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
391 459
392 $self->focus_in; 460 $self->focus_in;
393}
394 461
395sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
396sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
397sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
398sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
399sub 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
400 542
401sub draw { 543sub draw {
402 my ($self) = @_; 544 my ($self) = @_;
403 545
404 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);
405 557
406 glPushMatrix; 558 glPushMatrix;
407 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
408 $self->_draw;
409 glPopMatrix;
410 560
411 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
412 my ($x, $y) = @$self{qw(x y)};
413
414 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
415 glEnable GL_BLEND; 563 glEnable GL_BLEND;
416 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
417 glBegin GL_QUADS; 565 glBegin GL_QUADS;
418 glVertex $x , $y; 566 glVertex 0 , 0;
419 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
420 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
421 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
422 glEnd; 570 glEnd;
423 glDisable GL_BLEND; 571 glDisable GL_BLEND;
424 } 572 }
425 573
426 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
427 glPushMatrix; 575 glPushMatrix;
428 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
429 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
430 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
431 glVertex 0 , 0; 579 glVertex 0 , 0;
432 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
433 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
434 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
435 glEnd; 583 glEnd;
436 glPopMatrix; 584 glPopMatrix;
437 #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;
438 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
439} 590}
440 591
441sub _draw { 592sub _draw {
442 my ($self) = @_; 593 my ($self) = @_;
443 594
444 warn "no draw defined for $self\n"; 595 warn "no draw defined for $self\n";
445}
446
447sub find_widget {
448 my ($self, $x, $y) = @_;
449
450 return () unless $self->{can_events};
451
452 return $self
453 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
454 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
455
456 ()
457}
458
459sub set_parent {
460 my ($self, $parent) = @_;
461
462 Scalar::Util::weaken ($self->{parent} = $parent);
463
464 $self->{root} = $parent->{root};
465 $self->{visible} = $parent->{visible};
466
467 # TODO: req_w _does_change after ->reconfigure
468 $self->check_size
469 unless exists $self->{req_w};
470
471 $self->show;
472}
473
474sub check_size {
475 my ($self, $forced) = @_;
476
477 $self->{force_alloc} = 1 if $forced;
478 $CFClient::UI::ROOT->{check_size}{$self} = $self;
479}
480
481sub update {
482 my ($self) = @_;
483
484 $self->{parent}->update
485 if $self->{parent};
486}
487
488sub connect {
489 my ($self, $signal, $cb) = @_;
490
491 push @{ $self->{signal_cb}{$signal} }, $cb;
492}
493
494sub _emit {
495 my ($self, $signal, @args) = @_;
496
497 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
498}
499
500sub emit {
501 my ($self, $signal, @args) = @_;
502
503 $self->_emit ($signal, @args)
504 || $self->$signal (@args);
505} 596}
506 597
507sub DESTROY { 598sub DESTROY {
508 my ($self) = @_; 599 my ($self) = @_;
509 600
… …
541 632
542 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
543 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
544 635
545 glEnable GL_BLEND; 636 glEnable GL_BLEND;
546 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
547 glColor @$color; 638 glColor_premultiply @$color;
548 639
549 glBegin GL_QUADS; 640 glBegin GL_QUADS;
550 glVertex 0 , 0; 641 glVertex 0 , 0;
551 glVertex 0 , $h; 642 glVertex 0 , $h;
552 glVertex $w, $h; 643 glVertex $w, $h;
… …
567 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
568 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
569} 660}
570 661
571sub size_request { 662sub size_request {
572 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
573} 666}
574 667
575sub draw { } 668sub draw { }
576 669
577############################################################################# 670#############################################################################
… …
581our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
582 675
583sub new { 676sub new {
584 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
585 678
586 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
587 680
588 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
589 children => [], 682 children => [],
590 can_events => 0, 683 can_events => 0,
591 %arg, 684 %arg,
592 ); 685 );
686
593 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
594 689
595 $self 690 $self
596} 691}
597 692
598sub add { 693sub add {
… …
606 $self->{children} = [ 701 $self->{children} = [
607 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
608 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
609 ]; 704 ];
610 705
611 $self->check_size (1); 706 $self->realloc;
612 $self->update;
613} 707}
614 708
615sub children { 709sub children {
616 @{ $_[0]{children} } 710 @{ $_[0]{children} }
617} 711}
… …
622 delete $child->{parent}; 716 delete $child->{parent};
623 $child->hide; 717 $child->hide;
624 718
625 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
626 720
627 $self->check_size (1); 721 $self->realloc;
628 $self->update;
629} 722}
630 723
631sub clear { 724sub clear {
632 my ($self) = @_; 725 my ($self) = @_;
633 726
… …
637 for (@$children) { 730 for (@$children) {
638 delete $_->{parent}; 731 delete $_->{parent};
639 $_->hide; 732 $_->hide;
640 } 733 }
641 734
642 $self->check_size; 735 $self->realloc;
643 $self->update;
644} 736}
645 737
646sub find_widget { 738sub find_widget {
647 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
648 740
649 $x -= $self->{x}; 741 $x -= $self->{x};
650 $y -= $self->{y}; 742 $y -= $self->{y};
651 743
652 my $res; 744 my $res;
653 745
654 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
655 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
656 and return $res; 748 and return $res;
657 } 749 }
658 750
659 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
708 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
709} 801}
710 802
711############################################################################# 803#############################################################################
712 804
805# back-buffered drawing area
806
713package CFClient::UI::Window; 807package CFClient::UI::Window;
714 808
715our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
716 810
717use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
735 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
736 $self->update; 830 $self->update;
737} 831}
738 832
739sub _render { 833sub _render {
834 my ($self) = @_;
835
740 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
741} 837}
742 838
743sub render_child { 839sub render_child {
744 my ($self) = @_; 840 my ($self) = @_;
745 841
746 $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 {
747 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
748 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
749 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
750 $self->_render; 853 $self->_render;
751 }; 854 };
752} 855}
753 856
754sub _draw { 857sub _draw {
755 my ($self) = @_; 858 my ($self) = @_;
756 859
757 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
758 861
759 my $tex = $self->{texture} 862 my $tex = $self->{texture}
760 or return; 863 or return;
761 864
762 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
763 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
764 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
765 868
766 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
767 870
768 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
769} 872}
… …
785} 888}
786 889
787sub size_request { 890sub size_request {
788 my ($self) = @_; 891 my ($self) = @_;
789 892
790 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
791 894
792 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
793} 899}
794 900
795sub size_allocate { 901sub size_allocate {
796 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
797 903
904 my $child = $self->child;
905
798 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
799 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
800 908
801 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
802 $self->update; 910 $self->update;
803} 911}
804 912
… …
840} 948}
841 949
842sub _render { 950sub _render {
843 my ($self) = @_; 951 my ($self) = @_;
844 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
845 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
846 957
847 $self->SUPER::_render; 958 $self->SUPER::_render;
848} 959}
849 960
… …
852package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
853 964
854our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
855 966
856sub new { 967sub new {
857 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
858 971
859 my $self; 972 my $self;
860 973
861 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
862 vertical => 1, 975 vertical => 1,
863 range => [0, 0, 1, 0.01], # HACK fix 976 range => [0, 0, 1, 0.01], # HACK fix
864 connect_changed => sub { 977 on_changed => sub {
865 $self->{vp}->set_offset (0, $_[1]); 978 $self->{vp}->set_offset (0, $_[1]);
866 }, 979 },
867 ; 980 ;
868 981
869 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
870 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
871 slider => $slider, 984 slider => $slider,
872 @_, 985 %arg,
873 ); 986 );
874 987
875 $self->{vp}->add ($self->{scrolled});
876 $self->add ($self->{vp});
877 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
878 990
879 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
880} 998}
881 999
882sub update { 1000sub update {
883 my ($self) = @_; 1001 my ($self) = @_;
884 1002
… …
923 1041
924 if ($self->{bg}) { 1042 if ($self->{bg}) {
925 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
926 1044
927 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
928 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
929 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
930 1048
931 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
932 glVertex 0 , 0; 1050 glVertex 0 , 0;
933 glVertex 0 , $h; 1051 glVertex 0 , $h;
934 glVertex $w, $h; 1052 glVertex $w, $h;
… …
947 1065
948our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
949 1067
950use CFClient::OpenGL; 1068use CFClient::OpenGL;
951 1069
952my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
953 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
954 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);
955 1077
956sub new { 1078sub new {
957 my $class = shift; 1079 my ($class, %arg) = @_;
958 1080
959 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
960 1082
961 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
962 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
963 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
964 border => 0.6, 1086 border => 0.6,
965 is_toplevel => 1,
966 can_events => 1, 1087 can_events => 1,
967 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
968 ); 1091 );
969 1092
970 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
971 align => 0, 1094 align => 0,
972 valign => 1, 1095 valign => 1,
973 text => $self->{title}, 1096 text => $title,
974 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
975 1099
976 $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};
977} 1108}
978 1109
979sub border { 1110sub border {
980 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
981} 1112}
982 1113
983sub size_request { 1114sub size_request {
984 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
985 1119
986 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
987 1121
988 ( 1122 (
989 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
992} 1126}
993 1127
994sub size_allocate { 1128sub size_allocate {
995 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
996 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
997 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
998 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
999 1141
1000 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1001 if $self->{title};
1002
1003 $self->child->configure ($self->border, $self->border, $w, $h); 1142 $self->child->configure ($border, $border, $w, $h);
1004} 1143}
1005 1144
1006sub button_down { 1145sub button_down {
1007 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1008 1147
… …
1024 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1025 1164
1026 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1027 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1028 1167
1029 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1030 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1170
1031 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1032 $self->check_size; 1172 $self->realloc;
1033 }; 1173 };
1034 1174
1035 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1036 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1037 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1039 $self->{motion} = sub { 1179 $self->{motion} = sub {
1040 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1041 1181
1042 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1043 1183
1044 $self->move ($bx + $x - $ox, $by + $y - $oy); 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1045 $self->update; 1185 # HACK: the next line is required to enforce placement
1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1046 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1047 } 1192 1
1048} 1193}
1049 1194
1050sub button_up { 1195sub button_up {
1051 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1052 1197
1053 delete $self->{motion}; 1198 !!delete $self->{motion}
1054} 1199}
1055 1200
1056sub mouse_motion { 1201sub mouse_motion {
1057 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1058 1203
1059 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1060} 1207}
1061 1208
1062sub _draw { 1209sub _draw {
1063 my ($self) = @_; 1210 my ($self) = @_;
1064 1211
1212 my $child = $self->{children}[0];
1213
1065 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1066 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1067 1216
1068 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1069 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1070 1219
1071 my $border = $self->border; 1220 my $border = $self->border;
1072 1221
1073 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1074 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1075 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1076 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1077 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1078 1227
1079 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1080 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1081 1230
1082 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1083 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1084 my $rep_y = $ch / $bg->{h}; 1234 $bg->{t} = $ch / $bg->{h};
1085
1086 glColor @{ $self->{bg} };
1087
1088 $bg->{s} = $rep_x;
1089 $bg->{t} = $rep_y;
1090 $bg->{wrap_mode} = 1;
1091 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1092 } 1236 }
1093 1237
1094 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1095 1239
1096 $self->{title}->draw if $self->{title};
1097
1098 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1099} 1246}
1100 1247
1101############################################################################# 1248#############################################################################
1102 1249
1103package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1125 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1126 1273
1127 $child->set_parent ($self); 1274 $child->set_parent ($self);
1128 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1129 1276
1130 $self->check_size (1); 1277 $self->realloc;
1131} 1278}
1132 1279
1133# 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?
1134sub clear { 1281sub clear {
1135 my ($self) = @_; 1282 my ($self) = @_;
… …
1140 for (@children) { 1287 for (@children) {
1141 delete $_->{parent}; 1288 delete $_->{parent};
1142 $_->hide; 1289 $_->hide;
1143 } 1290 }
1144 1291
1145 $self->check_size (1); 1292 $self->realloc;
1146 $self->update;
1147} 1293}
1148 1294
1149sub get_wh { 1295sub get_wh {
1150 my ($self) = @_; 1296 my ($self) = @_;
1151 1297
… …
1247 } 1393 }
1248} 1394}
1249 1395
1250############################################################################# 1396#############################################################################
1251 1397
1252package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1253
1254# TODO: wrap into common Box base class
1255 1399
1256our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1257 1401
1258sub size_request { 1402sub size_request {
1259 my ($self) = @_; 1403 my ($self) = @_;
1260 1404
1261 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1262 1406 ? (
1263 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1264 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1265 (List::Util::max map $_->[1], @alloc), 1409 )
1266 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1267} 1414}
1268 1415
1269sub size_allocate { 1416sub size_allocate {
1270 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1271 1418
1272 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1273
1274 my $children = $self->{children}; 1420 my $children = $self->{children};
1275 1421
1276 my @h = map $_->{req_w}, @$children; 1422 my @req;
1277 1423
1278 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1279 1425 @req = ($space / (@$children || 1)) x @$children;
1280 if ($req_h > $h) {
1281 # ah well, not enough space
1282 $_ *= $h / $req_h for @h;
1283 } 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 {
1284 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1285 $exp ||= 1;
1286 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1287 for (0 .. $#$children) { 1439 for 0 .. $#$children;
1288 my $child = $children->[$_];
1289
1290 my $alloc_h = $h[$_];
1291 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1292 $h[$_] = $alloc_h;
1293 } 1440 }
1294 } 1441 }
1295 1442
1296 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1297 1444
1298 my $y = 0; 1445 my $pos = 0;
1299 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1300 my $child = $children->[$_];
1301 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1302 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1303 1449
1304 $y += $h; 1450 $pos += $alloc;
1305 } 1451 }
1306 1452
1307 1 1453 1
1308} 1454}
1309 1455
1310############################################################################# 1456#############################################################################
1311 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
1312package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1313 1474
1314# TODO: wrap into common Box base class
1315
1316our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1317 1476
1318sub size_request { 1477sub new {
1319 my ($self) = @_; 1478 my $class = shift;
1320 1479
1321 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1322 1481 vertical => 1,
1323 ( 1482 @_,
1324 (List::Util::max map $_->[0], @alloc),
1325 (List::Util::sum map $_->[1], @alloc),
1326 ) 1483 )
1327}
1328
1329sub size_allocate {
1330 my ($self, $w, $h) = @_;
1331
1332 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1333
1334 my $children = $self->{children};
1335
1336 my @h = map $_->{req_h}, @$children;
1337
1338 my $req_h = List::Util::sum @h;
1339
1340 if ($req_h > $h) {
1341 # ah well, not enough space
1342 $_ *= $h / $req_h for @h;
1343 } else {
1344 my $exp = List::Util::sum map $_->{expand}, @$children;
1345 $exp ||= 1;
1346
1347 for (0 .. $#$children) {
1348 my $child = $children->[$_];
1349
1350 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1351 }
1352 }
1353
1354 CFClient::UI::harmonize \@h;
1355
1356 my $y = 0;
1357 for (0 .. $#$children) {
1358 my $child = $children->[$_];
1359 my $h = $h[$_];
1360 $child->configure (0, $y, $w, $h);
1361
1362 $y += $h;
1363 }
1364
1365 1
1366} 1484}
1367 1485
1368############################################################################# 1486#############################################################################
1369 1487
1370package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1387 ellipsise => 3, # end 1505 ellipsise => 3, # end
1388 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1389 fontsize => 1, 1507 fontsize => 1,
1390 align => -1, 1508 align => -1,
1391 valign => -1, 1509 valign => -1,
1392 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1393 can_events => 0, 1512 can_events => 0,
1394 %arg 1513 %arg
1395 ); 1514 );
1396 1515
1397 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1424 1543
1425 delete $self->{texture}; 1544 delete $self->{texture};
1426 $self->SUPER::update; 1545 $self->SUPER::update;
1427} 1546}
1428 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1429sub set_text { 1555sub set_text {
1430 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1431 1557
1432 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1433 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1434 1560
1435 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1436 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1437 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1438 $self->update; 1566 $self->update;
1439 $self->check_size;
1440} 1567}
1441 1568
1442sub set_markup { 1569sub set_markup {
1443 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1444 1571
… …
1448 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1449 1576
1450 $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;
1451 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1452 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1453 $self->update; 1582 $self->update;
1454 $self->check_size;
1455} 1583}
1456 1584
1457sub size_request { 1585sub size_request {
1458 my ($self) = @_; 1586 my ($self) = @_;
1459 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1460 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1461 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1462 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1463 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1464 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1465 1596
1466 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1467 1598
1468 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1469 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1470 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1471 1602
1472 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1473 1604
1474 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1475 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1476 } 1607 }
1477 1608
1609 ($w, $h)
1478 ( 1610 }
1479 $w + $self->{padding} * 2,
1480 $h + $self->{padding} * 2,
1481 )
1482} 1611}
1483 1612
1484sub size_allocate { 1613sub size_allocate {
1485 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1486 1615
1616 delete $self->{ox};
1617
1487 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1488} 1620}
1489 1621
1490sub set_fontsize { 1622sub set_fontsize {
1491 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1492 1624
1493 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1494 delete $self->{texture}; 1626 delete $self->{texture};
1495 1627
1496 $self->update; 1628 $self->realloc;
1497 $self->check_size;
1498} 1629}
1499 1630
1500sub _draw { 1631sub _draw {
1501 my ($self) = @_; 1632 my ($self) = @_;
1502 1633
… …
1508 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1509 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1510 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1511 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1512 1643
1513 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1514 1646
1647 unless (exists $self->{ox}) {
1515 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1516 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1517 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1518 1651
1519 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1520 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1521 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1522
1523 $tex
1524 }; 1655 };
1525 1656
1526 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1528 1658
1529 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1530 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1531 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1532 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1533 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1534 } 1666 }
1535 1667
1536 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1537} 1669}
… …
1566 1698
1567 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1568 1700
1569 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1570 1702
1571 delete $self->{texture};
1572
1573 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1574 $self->{text} = $text; 1704 $self->{text} = $text;
1575 1705
1576 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1577 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1578 1709
1579 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1580} 1714}
1581 1715
1582sub set_text { 1716sub set_text {
1583 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1584 1718
1585 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1586 $self->_set_text ($text); 1720 $self->_set_text ($text);
1587 $self->update;
1588 $self->check_size;
1589} 1721}
1590 1722
1591sub get_text { 1723sub get_text {
1592 $_[0]{text} 1724 $_[0]{text}
1593} 1725}
… …
1623 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1624 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1625 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1626 } elsif ($uni) { 1758 } elsif ($uni) {
1627 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1628 } 1762 }
1629 1763
1630 $self->_set_text ($text); 1764 $self->_set_text ($text);
1631 $self->update; 1765
1632 $self->check_size; 1766 $self->realloc;
1767
1768 1
1633} 1769}
1634 1770
1635sub focus_in { 1771sub focus_in {
1636 my ($self) = @_; 1772 my ($self) = @_;
1637 1773
… …
1652 utf8::encode $text; 1788 utf8::encode $text;
1653 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1654 1790
1655 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1656 $self->update; 1792 $self->update;
1793
1794 1
1657} 1795}
1658 1796
1659sub mouse_motion { 1797sub mouse_motion {
1660 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1661# 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
1662} 1802}
1663 1803
1664sub _draw { 1804sub _draw {
1665 my ($self) = @_; 1805 my ($self) = @_;
1666 1806
1667 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1668 1808
1669 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1670 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1671 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1672 } else { 1812 } else {
1673 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1674 } 1814 }
1675 1815
1676 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1677 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1678 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1679 glVertex 0 , 0; 1819 glVertex 0 , 0;
1680 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1681 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1682 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1743 } else { 1883 } else {
1744 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1745 } 1885 }
1746 1886
1747 } else { 1887 } else {
1748 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1749 } 1891 1
1750
1751} 1892}
1752 1893
1753############################################################################# 1894#############################################################################
1754 1895
1755package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1764 1905
1765sub new { 1906sub new {
1766 my $class = shift; 1907 my $class = shift;
1767 1908
1768 $class->SUPER::new ( 1909 $class->SUPER::new (
1769 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1770 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1771 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1772 can_hover => 1, 1914 can_hover => 1,
1773 align => 0, 1915 align => 0,
1774 valign => 0, 1916 valign => 0,
… …
1783 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1784 1926
1785 $self->emit ("activate") 1927 $self->emit ("activate")
1786 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1787 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1788} 1932}
1789 1933
1790sub _draw { 1934sub _draw {
1791 my ($self) = @_; 1935 my ($self) = @_;
1792 1936
1793 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1794
1795 if ($GRAB == $self) {
1796 $self->{fg} = $self->{active_fg};
1797 }
1798 1938
1799 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1800 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1801 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1802 1942
… …
1821 1961
1822sub new { 1962sub new {
1823 my $class = shift; 1963 my $class = shift;
1824 1964
1825 $class->SUPER::new ( 1965 $class->SUPER::new (
1826 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1827 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1828 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1829 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1830 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1831 state => 0, 1972 state => 0,
… …
1835} 1976}
1836 1977
1837sub size_request { 1978sub size_request {
1838 my ($self) = @_; 1979 my ($self) = @_;
1839 1980
1840 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1841} 1982}
1842 1983
1843sub button_down { 1984sub button_down {
1844 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1845 1986
1846 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1847 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1848 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1849 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1850 } 1995 1
1851} 1996}
1852 1997
1853sub _draw { 1998sub _draw {
1854 my ($self) = @_; 1999 my ($self) = @_;
1855 2000
1856 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1857 2002
1858 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1859 2004
1860 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;
1861 2008
1862 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1863 2010
1864 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1865 2012
… …
2020 2167
2021 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2022 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2023 2170
2024 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2025 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;
2026 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2027 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2028 2176
2029 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2030 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2130 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2131 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2132 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2133 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2134 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2135 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2136 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2137 vertical => 0, 2285 vertical => 0,
2138 can_hover => 1, 2286 can_hover => 1,
2139 inner_pad => 0.02, 2287 inner_pad => 0.02,
2140 @_ 2288 @_
2141 ); 2289 );
… …
2144 $self->update; 2292 $self->update;
2145 2293
2146 $self 2294 $self
2147} 2295}
2148 2296
2297sub changed { }
2298
2149sub set_range { 2299sub set_range {
2150 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2151 2301
2152 ($range, $self->{range}) = ($self->{range}, $range); 2302 ($range, $self->{range}) = ($self->{range}, $range);
2153 2303
… …
2179} 2329}
2180 2330
2181sub size_request { 2331sub size_request {
2182 my ($self) = @_; 2332 my ($self) = @_;
2183 2333
2184 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2185 my $h = $self->{req_h};
2186
2187 $self->{vertical} ? ($h, $w) : ($w, $h)
2188} 2335}
2189 2336
2190sub button_down { 2337sub button_down {
2191 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2192 2339
2193 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2194 2341
2195 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2196 2343
2197 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2198} 2345}
2199 2346
2200sub mouse_motion { 2347sub mouse_motion {
2201 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2202 2349
… …
2206 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2207 2354
2208 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2209 2356
2210 $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
2211 } 2362 1
2212} 2363}
2213 2364
2214sub update { 2365sub update {
2215 my ($self) = @_; 2366 my ($self) = @_;
2216 2367
2217 $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}) {
2218 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2219 2377
2220 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2221 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2222 2380
… …
2228 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2229 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2230 2388
2231 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2232 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2233 }); 2391 }
2234
2235 $self->SUPER::update;
2236}
2237
2238sub _draw {
2239 my ($self) = @_;
2240 2392
2241 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2242 2394
2243 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2244 2396
… …
2438 2590
2439 delete $self->{texture}; 2591 delete $self->{texture};
2440 } 2592 }
2441 2593
2442 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2443 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2444 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2445 2597
2446 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2447 2599
2448 my $y0 = $top; 2600 my $y0 = $top;
… …
2483sub _draw { 2635sub _draw {
2484 my ($self) = @_; 2636 my ($self) = @_;
2485 2637
2486 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2488 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2489 $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});
2490 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2491 2643
2492 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2493 2645
2494} 2646}
… …
2543 2695
2544sub new { 2696sub new {
2545 my $class = shift; 2697 my $class = shift;
2546 2698
2547 my $self = $class->SUPER::new ( 2699 my $self = $class->SUPER::new (
2548 state => 0, 2700 state => 0,
2549 connect_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2550 @_ 2702 @_
2551 ); 2703 );
2552 2704
2553 if ($self->{state}) {
2554 $self->{state} = 0;
2555 $self->toggle_flopper;
2556 }
2557
2558 $self 2705 $self
2559} 2706}
2560 2707
2561sub toggle_flopper { 2708sub toggle_flopper {
2562 my ($self) = @_; 2709 my ($self) = @_;
2563 2710
2564 # TODO: use animation 2711 $self->{other}->toggle_visibility;
2565 if ($self->{state} = !$self->{state}) {
2566 $CFClient::UI::ROOT->add ($self->{other});
2567 $self->{other}->move ($self->coord2global (0, $self->{h}));
2568 $self->_emit ("open");
2569 } else {
2570 $CFClient::UI::ROOT->remove ($self->{other});
2571 $self->_emit ("close");
2572 }
2573
2574 $self->_emit (changed => $self->{state});
2575} 2712}
2576 2713
2577############################################################################# 2714#############################################################################
2578 2715
2579package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2592} 2729}
2593 2730
2594sub set_tooltip_from { 2731sub set_tooltip_from {
2595 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2596 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
2597 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2598 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2599 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2600 fontsize => 0.8, 2746 fontsize => 0.8,
2601 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2602 ellipsise => 0, 2748 ellipsise => 0,
2603 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2614 2760
2615sub size_allocate { 2761sub size_allocate {
2616 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2617 2763
2618 $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 });
2619} 2783}
2620 2784
2621sub _draw { 2785sub _draw {
2622 my ($self) = @_; 2786 my ($self) = @_;
2623 2787
… …
2640 glVertex $w, $h; 2804 glVertex $w, $h;
2641 glVertex $w, 0; 2805 glVertex $w, 0;
2642 glEnd; 2806 glEnd;
2643 2807
2644 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2645 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2646} 2811}
2647 2812
2648############################################################################# 2813#############################################################################
2649 2814
… …
2708 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2709 2874
2710 if ($tex) { 2875 if ($tex) {
2711 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2712 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2713 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2714 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2715 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2716 } 2881 }
2717} 2882}
2718 2883
… …
2725 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2726} 2891}
2727 2892
2728############################################################################# 2893#############################################################################
2729 2894
2730package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2731 2896
2732our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2733 2898
2734sub new { 2899# TODO: should actualyl wrap buttons and other goodies.
2735 my $class = shift;
2736
2737 my $self = $class->SUPER::new (
2738 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2739 @_,
2740 );
2741
2742 $self
2743}
2744
2745sub set_items {
2746 my ($self, $items) = @_;
2747
2748 $self->{scrolled}->clear;
2749 return unless $items;
2750
2751 my @items = sort {
2752 ($a->{type} <=> $b->{type})
2753 or ($a->{name} cmp $b->{name})
2754 } @$items;
2755
2756 $self->{real_items} = \@items;
2757
2758 my $row = 0;
2759 for my $item (@items) {
2760 CFClient::Item::update_widgets $item;
2761
2762 $self->{scrolled}->add (0, $row, $item->{face_widget});
2763 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2764 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2765
2766 $row++;
2767 }
2768}
2769
2770sub size_request {
2771 my ($self) = @_;
2772 ($self->{req_w}, $self->{req_h});
2773}
2774 2900
2775############################################################################# 2901#############################################################################
2776 2902
2777package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2778 2904
… …
2819 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2820 $GRAB = $self; 2946 $GRAB = $self;
2821 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2822 2948
2823 $self->show; 2949 $self->show;
2824 $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);
2825} 2951}
2826 2952
2827sub mouse_motion { 2953sub mouse_motion {
2828 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2829 2955
2830 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2831 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2832 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2833} 2961}
2834 2962
2835sub button_up { 2963sub button_up {
2836 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2837 2965
… …
2839 undef $GRAB; 2967 undef $GRAB;
2840 $self->hide; 2968 $self->hide;
2841 2969
2842 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2843 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2844 } 2976 1
2845} 2977}
2846 2978
2847############################################################################# 2979#############################################################################
2848 2980
2849package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2850 2982
2851our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2852 2984
2853sub new { 2985sub new {
2854 my $class = shift; 2986 my $class = shift;
2855 2987
2856 $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 (
2857 fontsize => 0.8, 3097 fontsize => 0.8,
2858 @_, 3098 @_,
2859 ) 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
2860} 3106}
2861 3107
2862sub reorder { 3108sub reorder {
2863 my ($self) = @_; 3109 my ($self) = @_;
2864 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} };
2865 3116
2866 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2867 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2868 } 3119 }
2869 3120
… …
2872 my @items = sort { 3123 my @items = sort {
2873 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2874 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2875 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2876 3127
3128 $self->{timer}->interval (1);
3129
2877 my $count = 10 + 1; 3130 my $count = 10 + 1;
2878 for my $item (@items) { 3131 for my $item (@items) {
2879 last unless --$count; 3132 last unless --$count;
2880 3133
2881 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2882 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2883 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2884 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2885 : $item->{text}; 3138 : $item->{text};
2886 3139
… …
2894 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2895 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2896 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2897 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2898 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2899 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2900 can_events => 1, 3153 can_events => 1,
2901 can_hover => 1 3154 can_hover => 1
2902 }; 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;
2903 } 3168 }
2904 3169
2905 $self->clear; 3170 $self->clear;
2906 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2907} 3172}
… …
2912 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2913 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2914 3179
2915 return unless $text; 3180 return unless $text;
2916 3181
2917 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2918 3183
2919 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2920 3185
2921 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2922 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2952 3217
2953 $self->reorder; 3218 $self->reorder;
2954 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2955} 3220}
2956 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2957############################################################################# 3230#############################################################################
2958 3231
2959package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2960 3233
2961our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2962
2963use CFClient::OpenGL;
2964 3235
2965sub new { 3236sub new {
2966 my $class = shift; 3237 my $class = shift;
2967 3238
2968 $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 => [],
2969 @_, 3481 @_,
2970 ) 3482 )
2971} 3483}
2972 3484
2973sub configure { 3485# XXX: Do sorting? Argl...
2974 my ($self, $x, $y, $w, $h) = @_; 3486sub add_spell {
2975
2976 $self->{w} = $w;
2977 $self->{h} = $h;
2978}
2979
2980sub check_size {
2981 my ($self) = @_; 3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
2982 3489
2983 $self->size_allocate ($self->{w}, $self->{h}) 3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2984 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
2985} 3546}
2986 3547
2987sub size_request { 3548sub size_request {
2988 my ($self) = @_; 3549 my ($self) = @_;
2989 3550
2990 ($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
2991} 3566}
2992 3567
2993sub size_allocate { 3568sub size_allocate {
2994 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
2995 3570
2996 for my $child ($self->children) { 3571 for my $child ($self->children) {
2997 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)};
2998 3573
2999 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3000 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3001 3576
3002 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3003 if exists $child->{req_y}; 3578 $Y = _to_pixel $Y, $H, $self->{h};
3004
3005 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3006 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3007 3579
3008 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3009 } 3581 }
3010} 3582}
3011 3583
… …
3022} 3594}
3023 3595
3024sub update { 3596sub update {
3025 my ($self) = @_; 3597 my ($self) = @_;
3026 3598
3027 $self->check_size;
3028 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3029} 3600}
3030 3601
3031sub add { 3602sub add {
3032 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3033 3604
3034 for (my @widgets = @children; my $w = pop @widgets; ) {
3035 push @widgets, $w->children;
3036 $w->{root} = $self;
3037 $w->{visible} = 1;
3038 }
3039
3040 for my $child (@children) {
3041 $child->{is_toplevel} = 1; 3605 $_->{is_toplevel} = 1
3042 3606 for @children;
3043 # integerise window positions
3044 $child->{x} = int $child->{x};
3045 $child->{y} = int $child->{y};
3046 }
3047 3607
3048 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3049} 3609}
3050 3610
3051sub remove { 3611sub remove {
3052 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3053 3613
3054 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3055 3618
3056 while (@children) { 3619 while (@children) {
3057 my $w = pop @children; 3620 my $w = pop @children;
3058 push @children, $w->children; 3621 push @children, $w->children;
3059 $w->set_invisible; 3622 $w->set_invisible;
… …
3078 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3079 $_->() 3642 $_->()
3080 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3081 } 3644 }
3082 3645
3083 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3084 my @queue = ([], []); 3647 my %queue;
3648 my @queue;
3649 my $widget;
3085 3650
3086 for (;;) { 3651 outer:
3087 if ($self->{check_size}) { 3652 while () {
3088 # heuristic: check containers last 3653 if (my $realloc = delete $self->{realloc}) {
3089 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3654 for $widget (values %$realloc) {
3090 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 }
3091 } 3661 }
3092 3662
3093 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3663 while () {
3664 @queue or last outer;
3094 3665
3095 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3666 $widget = pop @{ $queue[-1] || [] }
3096 ? @$widget{qw(user_w user_h)} 3667 and last;
3097 : $widget->size_request;
3098
3099 if (delete $widget->{force_alloc}
3100 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3101 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3102 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}) {
3103 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3104 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3105 3689
3106 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3107 3691
3108 $widget->{parent}->check_size
3109 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 }
3110 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3111 } 3702 }
3112 } 3703 }
3113 3704
3114 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3115 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3116 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)};
3117 3713
3118 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3119 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3120 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
3121 $widget->{w} = $w; 3724 $widget->{w} = $w;
3122 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3123 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3124 } 3729 }
3125 } 3730 }
3126 3731
3127 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3128 $_->() 3733 $_->()
3129 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3130 } 3735 }
3736
3131 3737
3132 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3133 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3134 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3135 3741
… …
3137 glLoadIdentity; 3743 glLoadIdentity;
3138 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3139 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3140 glLoadIdentity; 3746 glLoadIdentity;
3141 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
3142 $self->_draw; 3755 $self->_draw;
3143} 3756}
3144 3757
3145############################################################################# 3758#############################################################################
3146 3759

Diff Legend

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