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

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

Diff Legend

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