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.243 by root, Sat May 27 20:46:54 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 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
… …
16our $TOOLTIP; 17our $TOOLTIP;
17our $BUTTON_STATE; 18our $BUTTON_STATE;
18 19
19our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
20 21
21sub get_layout { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
22 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = {
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 };
29 }
30
31 return $LAYOUT;
32}
33
34sub set_layout {
35 my ($layout) = @_;
36 $LAYOUT = $layout;
37}
38
39sub check_tooltip {
40 if (!$GRAB) { 23 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
43
44 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
45 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
46 32
47 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
48 34
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 36
51 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
52 $TOOLTIP->show; 38 $TOOLTIP->show;
53
54 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
55
56 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
57 if $x + $TOOLTIP->{w} > $::WIDTH;
58
59 $TOOLTIP->move ($x, $y);
60 $TOOLTIP->check_size;
61 $TOOLTIP->update;
62 } 39 }
63 40
64 return; 41 return;
65 } 42 }
66 } 43 }
67 } 44 }
68 45
69 $TOOLTIP->hide; 46 $TOOLTIP->hide;
70 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;
71} 71}
72 72
73# class methods for events 73# class methods for events
74sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
75 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
89 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
90 90
91 $GRAB = $widget; 91 $GRAB = $widget;
92 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
93 93
94 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
95 } 95 }
96 96
97 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
98 98
99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
114 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
115 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
116 $grab->update if $grab; 116 $grab->update if $grab;
117 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
118 118
119 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
120 } 120 }
121} 121}
122 122
123sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
124 my ($ev) = @_; 124 my ($ev) = @_;
… …
130 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
131 131
132 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
133 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
134 134
135 check_tooltip; 135 $TOOLTIP_WATCHER->start;
136 } 136 }
137 137
138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
139 if $HOVER; 139 if $HOVER;
140} 140}
… …
172sub rescale_widgets { 172sub rescale_widgets {
173 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
174 174
175 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
176 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
177 $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.]+$/;
178 $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};
179 $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};
180 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
181 $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.]+$/;
182 $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};
183 $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};
184 $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
185 } 190 }
186 } 191 }
187 192
188 reconfigure_widgets; 193 reconfigure_widgets;
189} 194}
… …
198 203
199sub new { 204sub new {
200 my $class = shift; 205 my $class = shift;
201 206
202 my $self = bless { 207 my $self = bless {
203 x => 0, 208 x => "center",
204 y => 0, 209 y => "center",
205 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
206 can_events => 1, 213 can_events => 1,
207 @_ 214 @_
208 }, $class; 215 }, $class;
216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
209 218
210 for (keys %$self) { 219 for (keys %$self) {
211 if (/^on_(.*)$/) { 220 if (/^on_(.*)$/) {
212 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
213 } 222 }
214 } 223 }
215 224
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
218 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) { 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
219 $self->{user_x} = $layout->{x} * $::WIDTH; 226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
220 $self->{user_y} = $layout->{y} * $::HEIGHT; 227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
221 $self->{user_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH; 228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
222 $self->{user_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT; 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};
223 } 235 }
224 236
225 $self 237 $self
226} 238}
227 239
… …
232 %$self = (); 244 %$self = ();
233} 245}
234 246
235sub show { 247sub show {
236 my ($self) = @_; 248 my ($self) = @_;
249
237 return if $self->{parent}; 250 return if $self->{parent};
238 251
239 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
240} 253}
241 254
242sub show_centered { 255sub set_visible {
243 my ($self) = @_; 256 my ($self) = @_;
257
244 return if $self->{parent}; 258 return if $self->{visible};
245 259
246 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
247 262
248 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
249 "centered $self" => sub { 264
250 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
251 }, 266
252 ); 267 $_->set_visible for $self->children;
253} 268}
254 269
255sub set_invisible { 270sub set_invisible {
256 my ($self) = @_; 271 my ($self) = @_;
257 272
258 # broken show/hide model 273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
259 276
260 delete $self->{root}; 277 delete $self->{root};
261 delete $self->{visible}; 278 delete $self->{visible};
262 279
263 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
264 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
265 282
266 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
267 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
268 285
269 $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;
270} 306}
271 307
272sub hide { 308sub hide {
273 my ($self) = @_; 309 my ($self) = @_;
274 310
… …
276 312
277 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
278 if $self->{parent}; 314 if $self->{parent};
279} 315}
280 316
281sub move { 317sub move_abs {
282 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
283 319
284 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
285 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
286 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
287 323
288 $self->update; 324 $self->update;
289} 325}
290 326
291sub set_size { 327sub set_size {
292 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
293 329
294 $self->{user_w} = $w; 330 $self->{force_w} = $w;
295 $self->{user_h} = $h; 331 $self->{force_h} = $h;
296 332
297 $self->check_size; 333 $self->realloc;
298} 334}
299 335
300sub size_request { 336sub size_request {
301 require Carp; 337 require Carp;
302 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
304 340
305sub configure { 341sub configure {
306 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
307 343
308 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
309 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
310 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
311 349
312 # use alignment to adjust x, y 350 # use alignment to adjust x, y
313 351
314 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
315 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
316
317 ($w, $h) = ($w2, $h2);
318 } 354 }
319 355
320 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
321 $self->{x} = $x; 357 $self->{x} = $x;
322 $self->{y} = $y; 358 $self->{y} = $y;
323 $self->update; 359 $self->update;
324 } 360 }
325 361
326 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
327 $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;
328 } 369 }
329} 370}
330 371
331sub size_allocate { 372sub size_allocate {
332 # nothing to be done 373 # nothing to be done
333} 374}
334 375
335sub reconfigure {
336 my ($self) = @_;
337
338 $self->check_size (1);
339 $self->update;
340}
341
342sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
343} 382}
344 383
345sub set_max_size { 384sub set_max_size {
346 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
347 386
348 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
349 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
350} 391}
351 392
352sub set_tooltip { 393sub set_tooltip {
353 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
354 395
… …
359 400
360 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
361 402
362 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
363 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
364 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
365 } 406 }
366} 407}
367 408
368# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
369sub coord2local { 410sub coord2local {
… …
406 447
407 $::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
408 unless $FOCUS; 449 unless $FOCUS;
409} 450}
410 451
411sub mouse_motion { } 452sub mouse_motion { 0 }
412sub button_up { } 453sub button_up { 0 }
413sub key_down { } 454sub key_down { 0 }
414sub key_up { } 455sub key_up { 0 }
415 456
416sub button_down { 457sub button_down {
417 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
418 459
419 $self->focus_in; 460 $self->focus_in;
420}
421 461
422sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
423sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
424sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
425sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
426sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 466 my ($self, $x, $y) = @_;
467
468 return () unless $self->{can_events};
469
470 return $self
471 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
472 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
473
474 ()
475}
476
477sub set_parent {
478 my ($self, $parent) = @_;
479
480 Scalar::Util::weaken ($self->{parent} = $parent);
481 $self->set_visible if $parent->{visible};
482}
483
484sub connect {
485 my ($self, $signal, $cb) = @_;
486
487 push @{ $self->{signal_cb}{$signal} }, $cb;
488}
489
490sub _emit {
491 my ($self, $signal, @args) = @_;
492
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
494}
495
496sub emit {
497 my ($self, $signal, @args) = @_;
498
499 $self->_emit ($signal, @args)
500 || $self->$signal (@args);
501}
502
503sub visibility_change {
504 #my ($self, $visible) = @_;
505}
506
507sub realloc {
508 my ($self) = @_;
509
510 if ($self->{visible}) {
511 return if $self->{root}{realloc}{$self+0};
512
513 $self->{root}{realloc}{$self+0} = $self;
514 $self->{root}->update;
515 } else {
516 delete $self->{req_w};
517 delete $self->{req_h};
518 }
519}
520
521sub update {
522 my ($self) = @_;
523
524 $self->{parent}->update
525 if $self->{parent};
526}
527
528sub reconfigure {
529 my ($self) = @_;
530
531 $self->realloc;
532 $self->update;
533}
534
535# using global variables seems a bit hacky, but passing through all drawing
536# functions seems pointless.
537our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 538
428sub draw { 539sub draw {
429 my ($self) = @_; 540 my ($self) = @_;
430 541
431 return unless $self->{h} && $self->{w}; 542 return unless $self->{h} && $self->{w};
543
544 # update screen rectangle
545 local $draw_x = $draw_x + $self->{x};
546 local $draw_y = $draw_y + $self->{y};
547 local $draw_w = $draw_x + $self->{w};
548 local $draw_h = $draw_y + $self->{h};
549
550 # skip widgets that are entirely outside the drawing area
551 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
552 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 553
433 glPushMatrix; 554 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 556
438 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 559 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 561 glBegin GL_QUADS;
445 glVertex $x , $y; 562 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
449 glEnd; 566 glEnd;
450 glDisable GL_BLEND; 567 glDisable GL_BLEND;
451 } 568 }
452 569
453 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 571 glPushMatrix;
455 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 575 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
462 glEnd; 579 glEnd;
463 glPopMatrix; 580 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 581 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
466} 586}
467 587
468sub _draw { 588sub _draw {
469 my ($self) = @_; 589 my ($self) = @_;
470 590
471 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
472}
473
474sub find_widget {
475 my ($self, $x, $y) = @_;
476
477 return () unless $self->{can_events};
478
479 return $self
480 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
481 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
482
483 ()
484}
485
486sub set_parent {
487 my ($self, $parent) = @_;
488
489 Scalar::Util::weaken ($self->{parent} = $parent);
490
491 $self->{root} = $parent->{root};
492 $self->{visible} = $parent->{visible} + 1;
493
494 # TODO: req_w _does_change after ->reconfigure
495 $self->check_size
496 unless exists $self->{req_w};
497
498 $self->show;
499}
500
501sub check_size {
502 my ($self, $forced) = @_;
503
504 $self->{force_alloc} = 1 if $forced;
505 $CFClient::UI::ROOT->{check_size}{$self} = $self;
506}
507
508sub update {
509 my ($self) = @_;
510
511 $self->{parent}->update
512 if $self->{parent};
513}
514
515sub connect {
516 my ($self, $signal, $cb) = @_;
517
518 push @{ $self->{signal_cb}{$signal} }, $cb;
519}
520
521sub _emit {
522 my ($self, $signal, @args) = @_;
523
524 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
525}
526
527sub emit {
528 my ($self, $signal, @args) = @_;
529
530 $self->_emit ($signal, @args)
531 || $self->$signal (@args);
532} 592}
533 593
534sub DESTROY { 594sub DESTROY {
535 my ($self) = @_; 595 my ($self) = @_;
536 596
… …
568 628
569 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
571 631
572 glEnable GL_BLEND; 632 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 634 glColor_premultiply @$color;
575 635
576 glBegin GL_QUADS; 636 glBegin GL_QUADS;
577 glVertex 0 , 0; 637 glVertex 0 , 0;
578 glVertex 0 , $h; 638 glVertex 0 , $h;
579 glVertex $w, $h; 639 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
596} 656}
597 657
598sub size_request { 658sub size_request {
599 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
600} 662}
601 663
602sub draw { } 664sub draw { }
603 665
604############################################################################# 666#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
609 671
610sub new { 672sub new {
611 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
612 674
613 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
614 676
615 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
616 children => [], 678 children => [],
617 can_events => 0, 679 can_events => 0,
618 %arg, 680 %arg,
619 ); 681 );
682
620 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
621 685
622 $self 686 $self
623} 687}
624 688
625sub add { 689sub add {
… …
633 $self->{children} = [ 697 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
636 ]; 700 ];
637 701
638 $self->check_size (1); 702 $self->realloc;
639 $self->update;
640} 703}
641 704
642sub children { 705sub children {
643 @{ $_[0]{children} } 706 @{ $_[0]{children} }
644} 707}
… …
649 delete $child->{parent}; 712 delete $child->{parent};
650 $child->hide; 713 $child->hide;
651 714
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 716
654 $self->check_size (1); 717 $self->realloc;
655 $self->update;
656} 718}
657 719
658sub clear { 720sub clear {
659 my ($self) = @_; 721 my ($self) = @_;
660 722
… …
664 for (@$children) { 726 for (@$children) {
665 delete $_->{parent}; 727 delete $_->{parent};
666 $_->hide; 728 $_->hide;
667 } 729 }
668 730
669 $self->check_size; 731 $self->realloc;
670 $self->update;
671} 732}
672 733
673sub find_widget { 734sub find_widget {
674 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
675 736
676 $x -= $self->{x}; 737 $x -= $self->{x};
677 $y -= $self->{y}; 738 $y -= $self->{y};
678 739
679 my $res; 740 my $res;
680 741
681 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
683 and return $res; 744 and return $res;
684 } 745 }
685 746
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
736} 797}
737 798
738############################################################################# 799#############################################################################
739 800
801# back-buffered drawing area
802
740package CFClient::UI::Window; 803package CFClient::UI::Window;
741 804
742our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
743 806
744use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 826 $self->update;
764} 827}
765 828
766sub _render { 829sub _render {
830 my ($self) = @_;
831
767 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
768} 833}
769 834
770sub render_child { 835sub render_child {
771 my ($self) = @_; 836 my ($self) = @_;
772 837
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 838 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
776 841
842 {
843 package CFClient::UI::Base;
844
845 ($draw_x, $draw_y, $draw_w, $draw_h) =
846 (0, 0, $self->{w}, $self->{h});
847 }
848
777 $self->_render; 849 $self->_render;
778 }; 850 };
779} 851}
780 852
781sub _draw { 853sub _draw {
782 my ($self) = @_; 854 my ($self) = @_;
783 855
784 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
785 857
786 my $tex = $self->{texture} 858 my $tex = $self->{texture}
787 or return; 859 or return;
788 860
789 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
792 864
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 866
795 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
796} 868}
… …
812} 884}
813 885
814sub size_request { 886sub size_request {
815 my ($self) = @_; 887 my ($self) = @_;
816 888
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 890
819 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
820} 895}
821 896
822sub size_allocate { 897sub size_allocate {
823 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
824 899
900 my $child = $self->child;
901
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 904
828 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
829 $self->update; 906 $self->update;
830} 907}
831 908
… …
867} 944}
868 945
869sub _render { 946sub _render {
870 my ($self) = @_; 947 my ($self) = @_;
871 948
949 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
950 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
951
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 953
874 $self->SUPER::_render; 954 $self->SUPER::_render;
875} 955}
876 956
… …
879package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
880 960
881our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
882 962
883sub new { 963sub new {
884 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
885 967
886 my $self; 968 my $self;
887 969
888 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
889 vertical => 1, 971 vertical => 1,
… …
894 ; 976 ;
895 977
896 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 980 slider => $slider,
899 @_, 981 %arg,
900 ); 982 );
901 983
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
905 986
906 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
907} 994}
908 995
909sub update { 996sub update {
910 my ($self) = @_; 997 my ($self) = @_;
911 998
… …
950 1037
951 if ($self->{bg}) { 1038 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
953 1040
954 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
957 1044
958 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
959 glVertex 0 , 0; 1046 glVertex 0 , 0;
960 glVertex 0 , $h; 1047 glVertex 0 , $h;
961 glVertex $w, $h; 1048 glVertex $w, $h;
… …
974 1061
975our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
976 1063
977use CFClient::OpenGL; 1064use CFClient::OpenGL;
978 1065
979my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
981 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1072 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1073
983sub new { 1074sub new {
984 my $class = shift; 1075 my ($class, %arg) = @_;
985 1076
986 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
987 1078
988 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1082 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1083 can_events => 1,
994 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
995 ); 1087 );
996 1088
997 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
998 align => 0, 1090 align => 0,
999 valign => 1, 1091 valign => 1,
1000 text => $self->{title}, 1092 text => $title,
1001 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1002 1095
1003 $self 1096 $self
1097}
1098
1099sub add {
1100 my ($self, @widgets) = @_;
1101
1102 $self->SUPER::add (@widgets);
1103 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1104}
1005 1105
1006sub border { 1106sub border {
1007 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1008} 1108}
1009 1109
1010sub size_request { 1110sub size_request {
1011 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1012 1115
1013 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1014 1117
1015 ( 1118 (
1016 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1019} 1122}
1020 1123
1021sub size_allocate { 1124sub size_allocate {
1022 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1023 1126
1127 if ($self->{title}) {
1128 $self->{title}{w} = $w;
1129 $self->{title}{h} = $h;
1130 $self->{title}->size_allocate ($w, $h);
1131 }
1132
1133 my $border = $self->border;
1134
1024 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1026 1137
1027 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1028 if $self->{title};
1029
1030 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1031} 1139}
1032 1140
1033sub button_down { 1141sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1035 1143
… …
1051 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1052 1160
1053 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1055 1163
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1166
1061 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1062 }; 1169 };
1063 1170
1064 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1175 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1070 1177
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1179
1073 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1078 } 1188 1
1079} 1189}
1080 1190
1081sub button_up { 1191sub button_up {
1082 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1083 1193
1084 delete $self->{motion}; 1194 !!delete $self->{motion}
1085} 1195}
1086 1196
1087sub mouse_motion { 1197sub mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1089 1199
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1091} 1203}
1092 1204
1093sub _draw { 1205sub _draw {
1094 my ($self) = @_; 1206 my ($self) = @_;
1095 1207
1208 my $child = $self->{children}[0];
1209
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1212
1099 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1215
1102 my $border = $self->border; 1216 my $border = $self->border;
1103 1217
1104 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1223
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1112 1226
1113 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1116
1117 glColor @{ $self->{bg} };
1118
1119 $bg->{s} = $rep_x;
1120 $bg->{t} = $rep_y;
1121 $bg->{wrap_mode} = 1;
1122 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1232 }
1124 1233
1125 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1126 1235
1127 $self->{title}->draw if $self->{title};
1128
1129 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1130} 1242}
1131 1243
1132############################################################################# 1244#############################################################################
1133 1245
1134package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1157 1269
1158 $child->set_parent ($self); 1270 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1160 1272
1161 $self->check_size (1); 1273 $self->realloc;
1162} 1274}
1163 1275
1164# TODO: move to container class maybe? send children a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1277sub clear {
1166 my ($self) = @_; 1278 my ($self) = @_;
… …
1171 for (@children) { 1283 for (@children) {
1172 delete $_->{parent}; 1284 delete $_->{parent};
1173 $_->hide; 1285 $_->hide;
1174 } 1286 }
1175 1287
1176 $self->check_size (1); 1288 $self->realloc;
1177 $self->update;
1178} 1289}
1179 1290
1180sub get_wh { 1291sub get_wh {
1181 my ($self) = @_; 1292 my ($self) = @_;
1182 1293
… …
1278 } 1389 }
1279} 1390}
1280 1391
1281############################################################################# 1392#############################################################################
1282 1393
1283package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1395
1287our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1288 1397
1289sub size_request { 1398sub size_request {
1290 my ($self) = @_; 1399 my ($self) = @_;
1291 1400
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1293 1402 ? (
1294 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1405 )
1297 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1298} 1410}
1299 1411
1300sub size_allocate { 1412sub size_allocate {
1301 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1302 1414
1303 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1416 my $children = $self->{children};
1306 1417
1307 my @h = map $_->{req_w}, @$children; 1418 my @req;
1308 1419
1309 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1310 1421 @req = ($space / (@$children || 1)) x @$children;
1311 if ($req_h > $h) {
1312 # ah well, not enough space
1313 $_ *= $h / $req_h for @h;
1314 } else { 1422 } else {
1423 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1424 my $req = List::Util::sum @req;
1425
1426 if ($req > $space) {
1427 # ah well, not enough space
1428 $_ *= $space / $req for @req;
1429 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1319 my $child = $children->[$_];
1320
1321 my $alloc_h = $h[$_];
1322 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1323 $h[$_] = $alloc_h;
1324 } 1436 }
1325 } 1437 }
1326 1438
1327 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1328 1440
1329 my $y = 0; 1441 my $pos = 0;
1330 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1445
1335 $y += $h; 1446 $pos += $alloc;
1336 } 1447 }
1337 1448
1338 1 1449 1
1339} 1450}
1340 1451
1341############################################################################# 1452#############################################################################
1342 1453
1454package CFClient::UI::HBox;
1455
1456our @ISA = CFClient::UI::Box::;
1457
1458sub new {
1459 my $class = shift;
1460
1461 $class->SUPER::new (
1462 vertical => 0,
1463 @_,
1464 )
1465}
1466
1467#############################################################################
1468
1343package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1344 1470
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1348 1472
1349sub size_request { 1473sub new {
1350 my ($self) = @_; 1474 my $class = shift;
1351 1475
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1353 1477 vertical => 1,
1354 ( 1478 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1479 )
1358}
1359
1360sub size_allocate {
1361 my ($self, $w, $h) = @_;
1362
1363 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1364
1365 my $children = $self->{children};
1366
1367 my @h = map $_->{req_h}, @$children;
1368
1369 my $req_h = List::Util::sum @h;
1370
1371 if ($req_h > $h) {
1372 # ah well, not enough space
1373 $_ *= $h / $req_h for @h;
1374 } else {
1375 my $exp = List::Util::sum map $_->{expand}, @$children;
1376 $exp ||= 1;
1377
1378 for (0 .. $#$children) {
1379 my $child = $children->[$_];
1380
1381 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1382 }
1383 }
1384
1385 CFClient::UI::harmonize \@h;
1386
1387 my $y = 0;
1388 for (0 .. $#$children) {
1389 my $child = $children->[$_];
1390 my $h = $h[$_];
1391 $child->configure (0, $y, $w, $h);
1392
1393 $y += $h;
1394 }
1395
1396 1
1397} 1480}
1398 1481
1399############################################################################# 1482#############################################################################
1400 1483
1401package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1501 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1420 fontsize => 1, 1503 fontsize => 1,
1421 align => -1, 1504 align => -1,
1422 valign => -1, 1505 valign => -1,
1423 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1424 can_events => 0, 1508 can_events => 0,
1425 %arg 1509 %arg
1426 ); 1510 );
1427 1511
1428 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1455 1539
1456 delete $self->{texture}; 1540 delete $self->{texture};
1457 $self->SUPER::update; 1541 $self->SUPER::update;
1458} 1542}
1459 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1460sub set_text { 1551sub set_text {
1461 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1462 1553
1463 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1465 1556
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1468 1559
1560 delete $self->{size_req};
1561 $self->realloc;
1469 $self->update; 1562 $self->update;
1470 $self->check_size;
1471} 1563}
1472 1564
1473sub set_markup { 1565sub set_markup {
1474 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1475 1567
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1572
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1573 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1483 1575
1576 delete $self->{size_req};
1577 $self->realloc;
1484 $self->update; 1578 $self->update;
1485 $self->check_size;
1486} 1579}
1487 1580
1488sub size_request { 1581sub size_request {
1489 my ($self) = @_; 1582 my ($self) = @_;
1490 1583
1584 $self->{size_req} ||= do {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1585 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1586 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1587 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1588 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1589 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1590
1497 my ($w, $h) = $self->{layout}->size; 1591 my ($w, $h) = $self->{layout}->size;
1498 1592
1499 if (exists $self->{template}) { 1593 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1594 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1596
1503 my ($w2, $h2) = $self->{template}->size; 1597 my ($w2, $h2) = $self->{template}->size;
1504 1598
1505 $w = List::Util::max $w, $w2; 1599 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1600 $h = List::Util::max $h, $h2;
1601 }
1602
1603 [$w, $h]
1507 } 1604 };
1508 1605
1509 ( 1606 @{ $self->{size_req} }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1607}
1514 1608
1515sub size_allocate { 1609sub size_allocate {
1516 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1517 1611
1612 delete $self->{ox};
1613
1518 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519} 1616}
1520 1617
1521sub set_fontsize { 1618sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1523 1620
1524 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1622 delete $self->{texture};
1526 1623
1527 $self->update; 1624 $self->realloc;
1528 $self->check_size; 1625}
1626
1627sub reconfigure {
1628 my ($self) = @_;
1629
1630 delete $self->{size_req};
1631
1632 $self->SUPER::reconfigure;
1529} 1633}
1530 1634
1531sub _draw { 1635sub _draw {
1532 my ($self) = @_; 1636 my ($self) = @_;
1533 1637
… …
1539 $self->{layout}->set_width ($self->{w}); 1643 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1644 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1645 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1646 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1647
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1648 new_from_layout CFClient::Texture $self->{layout}
1649 };
1545 1650
1651 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1652 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1653 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1654 : ($self->{w} - $tex->{w}) * 0.5);
1549 1655
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1656 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1657 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1658 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1659 };
1556 1660
1557 glEnable GL_TEXTURE_2D; 1661 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 1662
1560 if ($tex->{format} == GL_ALPHA) { 1663 if ($tex->{format} == GL_ALPHA) {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1665 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1666 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else { 1667 } else {
1668 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1669 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 } 1670 }
1566 1671
1567 glDisable GL_TEXTURE_2D; 1672 glDisable GL_TEXTURE_2D;
1568} 1673}
… …
1597 1702
1598 delete $self->{cur_h}; 1703 delete $self->{cur_h};
1599 1704
1600 return if $self->{text} eq $text; 1705 return if $self->{text} eq $text;
1601 1706
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1707 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1708 $self->{text} = $text;
1606 1709
1607 $text =~ s/./*/g if $self->{hidden}; 1710 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1711 $self->{layout}->set_text ("$text ");
1712 delete $self->{size_req};
1609 1713
1610 $self->_emit (changed => $self->{text}); 1714 $self->_emit (changed => $self->{text});
1715
1716 $self->realloc;
1717 $self->update;
1611} 1718}
1612 1719
1613sub set_text { 1720sub set_text {
1614 my ($self, $text) = @_; 1721 my ($self, $text) = @_;
1615 1722
1616 $self->{cursor} = length $text; 1723 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1724 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1725}
1621 1726
1622sub get_text { 1727sub get_text {
1623 $_[0]{text} 1728 $_[0]{text}
1624} 1729}
… …
1654 $self->{cursor} = length $text; 1759 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1760 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1761 $self->_emit ('escape');
1657 } elsif ($uni) { 1762 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1763 substr $text, $self->{cursor}++, 0, chr $uni;
1764 } else {
1765 return 0;
1659 } 1766 }
1660 1767
1661 $self->_set_text ($text); 1768 $self->_set_text ($text);
1662 $self->update; 1769
1663 $self->check_size; 1770 $self->realloc;
1771
1772 1
1664} 1773}
1665 1774
1666sub focus_in { 1775sub focus_in {
1667 my ($self) = @_; 1776 my ($self) = @_;
1668 1777
… …
1683 utf8::encode $text; 1792 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1793 $self->{cursor} = length substr $text, 0, $idx;
1685 1794
1686 $self->_set_text ($self->{text}); 1795 $self->_set_text ($self->{text});
1687 $self->update; 1796 $self->update;
1797
1798 1
1688} 1799}
1689 1800
1690sub mouse_motion { 1801sub mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1802 my ($self, $ev, $x, $y) = @_;
1692# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1803# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1804
1805 0
1693} 1806}
1694 1807
1695sub _draw { 1808sub _draw {
1696 my ($self) = @_; 1809 my ($self) = @_;
1697 1810
1698 local $self->{fg} = $self->{fg}; 1811 local $self->{fg} = $self->{fg};
1699 1812
1700 if ($FOCUS == $self) { 1813 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1814 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1815 $self->{fg} = $self->{active_fg};
1703 } else { 1816 } else {
1704 glColor @{$self->{bg}}; 1817 glColor_premultiply @{$self->{bg}};
1705 } 1818 }
1706 1819
1707 glEnable GL_BLEND; 1820 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1821 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1822 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1823 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1824 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1825 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1826 glVertex $self->{w}, 0;
… …
1774 } else { 1887 } else {
1775 $self->set_text ($self->{history_saveback}); 1888 $self->set_text ($self->{history_saveback});
1776 } 1889 }
1777 1890
1778 } else { 1891 } else {
1779 $self->SUPER::key_down ($ev); 1892 return $self->SUPER::key_down ($ev)
1893 }
1894
1780 } 1895 1
1781
1782} 1896}
1783 1897
1784############################################################################# 1898#############################################################################
1785 1899
1786package CFClient::UI::Button; 1900package CFClient::UI::Button;
… …
1795 1909
1796sub new { 1910sub new {
1797 my $class = shift; 1911 my $class = shift;
1798 1912
1799 $class->SUPER::new ( 1913 $class->SUPER::new (
1800 padding => 4, 1914 padding_x => 4,
1915 padding_y => 4,
1801 fg => [1, 1, 1], 1916 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1917 active_fg => [0, 0, 1],
1803 can_hover => 1, 1918 can_hover => 1,
1804 align => 0, 1919 align => 0,
1805 valign => 0, 1920 valign => 0,
… …
1814 my ($self, $ev, $x, $y) = @_; 1929 my ($self, $ev, $x, $y) = @_;
1815 1930
1816 $self->emit ("activate") 1931 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1932 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1933 && $y >= 0 && $y < $self->{h};
1934
1935 1
1819} 1936}
1820 1937
1821sub _draw { 1938sub _draw {
1822 my ($self) = @_; 1939 my ($self) = @_;
1823 1940
1824 local $self->{fg} = $self->{fg}; 1941 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1942
1830 glEnable GL_TEXTURE_2D; 1943 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1944 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1945 glColor 0, 0, 0, 1;
1833 1946
… …
1852 1965
1853sub new { 1966sub new {
1854 my $class = shift; 1967 my $class = shift;
1855 1968
1856 $class->SUPER::new ( 1969 $class->SUPER::new (
1857 padding => 2, 1970 padding_x => 2,
1971 padding_y => 2,
1858 fg => [1, 1, 1], 1972 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1973 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1974 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1975 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1976 state => 0,
… …
1866} 1980}
1867 1981
1868sub size_request { 1982sub size_request {
1869 my ($self) = @_; 1983 my ($self) = @_;
1870 1984
1871 ($self->{padding} * 2 + 6) x 2 1985 (6) x 2
1872} 1986}
1873 1987
1874sub button_down { 1988sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1989 my ($self, $ev, $x, $y) = @_;
1876 1990
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1991 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1992 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 1993 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 1994 $self->_emit (changed => $self->{state});
1995 } else {
1996 return 0
1997 }
1998
1881 } 1999 1
1882} 2000}
1883 2001
1884sub _draw { 2002sub _draw {
1885 my ($self) = @_; 2003 my ($self) = @_;
1886 2004
1887 $self->SUPER::_draw; 2005 $self->SUPER::_draw;
1888 2006
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2007 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2008
1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2009 my ($w, $h) = @$self{qw(w h)};
2010
2011 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892 2012
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2013 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2014
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2015 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2016
… …
2051 2171
2052 my $h1 = $self->{h} * (1 - $ycut1); 2172 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2173 my $h2 = $self->{h} * (1 - $ycut2);
2054 2174
2055 glEnable GL_BLEND; 2175 glEnable GL_BLEND;
2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2176 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2177 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2057 glEnable GL_TEXTURE_2D; 2178 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2179 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2180
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2181 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2182 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2282 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2283 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2284 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2285 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2286 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2287 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2288 min_h => $::WIDTH / 80,
2168 vertical => 0, 2289 vertical => 0,
2169 can_hover => 1, 2290 can_hover => 1,
2170 inner_pad => 0.02, 2291 inner_pad => 0.02,
2171 @_ 2292 @_
2172 ); 2293 );
… …
2175 $self->update; 2296 $self->update;
2176 2297
2177 $self 2298 $self
2178} 2299}
2179 2300
2301sub changed { }
2302
2180sub set_range { 2303sub set_range {
2181 my ($self, $range) = @_; 2304 my ($self, $range) = @_;
2182 2305
2183 ($range, $self->{range}) = ($self->{range}, $range); 2306 ($range, $self->{range}) = ($self->{range}, $range);
2184 2307
… …
2210} 2333}
2211 2334
2212sub size_request { 2335sub size_request {
2213 my ($self) = @_; 2336 my ($self) = @_;
2214 2337
2215 my $w = $self->{req_w}; 2338 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2339}
2220 2340
2221sub button_down { 2341sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2342 my ($self, $ev, $x, $y) = @_;
2223 2343
2224 $self->SUPER::button_down ($ev, $x, $y); 2344 $self->SUPER::button_down ($ev, $x, $y);
2225 2345
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2346 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2347
2228 $self->mouse_motion ($ev, $x, $y); 2348 $self->mouse_motion ($ev, $x, $y)
2229} 2349}
2230 2350
2231sub mouse_motion { 2351sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2352 my ($self, $ev, $x, $y) = @_;
2233 2353
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2357 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2358
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2359 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2360
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2361 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2362 } else {
2363 return 0;
2364 }
2365
2242 } 2366 1
2243} 2367}
2244 2368
2245sub update { 2369sub update {
2246 my ($self) = @_; 2370 my ($self) = @_;
2247 2371
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2372 delete $self->{knob_w};
2373 $self->SUPER::update;
2374}
2375
2376sub _draw {
2377 my ($self) = @_;
2378
2379 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2380 $self->set_value ($self->{range}[0]);
2250 2381
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2382 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2383 my $range = ($hi - $page - $lo) || 1e-100;
2253 2384
… …
2259 $value = ($value - $lo) / $range; 2390 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2391 $value = $value * $self->{scale} + $self->{offset};
2261 2392
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2393 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2394 $self->{knob_w} = $knob_w;
2264 }); 2395 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2396
2272 $self->SUPER::_draw (); 2397 $self->SUPER::_draw ();
2273 2398
2274 glScale $self->{w}, $self->{h}; 2399 glScale $self->{w}, $self->{h};
2275 2400
… …
2469 2594
2470 delete $self->{texture}; 2595 delete $self->{texture};
2471 } 2596 }
2472 2597
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2598 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2599 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2600 glClear GL_COLOR_BUFFER_BIT;
2476 2601
2477 my $top = int $self->{children}[1]{range}[0]; 2602 my $top = int $self->{children}[1]{range}[0];
2478 2603
2479 my $y0 = $top; 2604 my $y0 = $top;
… …
2514sub _draw { 2639sub _draw {
2515 my ($self) = @_; 2640 my ($self) = @_;
2516 2641
2517 glEnable GL_TEXTURE_2D; 2642 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2643 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2644 glColor 0, 0, 0, 1;
2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2645 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2521 glDisable GL_TEXTURE_2D; 2646 glDisable GL_TEXTURE_2D;
2522 2647
2523 $self->{children}[1]->draw; 2648 $self->{children}[1]->draw;
2524 2649
2525} 2650}
… …
2579 state => 0, 2704 state => 0,
2580 on_activate => \&toggle_flopper, 2705 on_activate => \&toggle_flopper,
2581 @_ 2706 @_
2582 ); 2707 );
2583 2708
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2709 $self
2590} 2710}
2591 2711
2592sub toggle_flopper { 2712sub toggle_flopper {
2593 my ($self) = @_; 2713 my ($self) = @_;
2594 2714
2595 # TODO: use animation 2715 $self->{other}->toggle_visibility;
2596 if ($self->{state} = !$self->{state}) {
2597 $CFClient::UI::ROOT->add ($self->{other});
2598 $self->{other}->move ($self->coord2global (0, $self->{h}));
2599 $self->_emit ("open");
2600 } else {
2601 $CFClient::UI::ROOT->remove ($self->{other});
2602 $self->_emit ("close");
2603 }
2604
2605 $self->_emit (changed => $self->{state});
2606} 2716}
2607 2717
2608############################################################################# 2718#############################################################################
2609 2719
2610package CFClient::UI::Tooltip; 2720package CFClient::UI::Tooltip;
… …
2623} 2733}
2624 2734
2625sub set_tooltip_from { 2735sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2736 my ($self, $widget) = @_;
2627 2737
2738 my $tooltip = $widget->{tooltip};
2739
2740 if ($ENV{CFPLUS_DEBUG} & 2) {
2741 $tooltip .= "\n\n" . (ref $widget) . "\n"
2742 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2743 . "req $widget->{req_w} $widget->{req_h}\n"
2744 . "visible $widget->{visible}";
2745 }
2746
2628 $self->add (new CFClient::UI::Label 2747 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2748 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2749 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2750 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2751 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2752 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2753 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2764
2646sub size_allocate { 2765sub size_allocate {
2647 my ($self, $w, $h) = @_; 2766 my ($self, $w, $h) = @_;
2648 2767
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2768 $self->SUPER::size_allocate ($w - 4, $h - 4);
2769}
2770
2771sub visibility_change {
2772 my ($self, $visible) = @_;
2773
2774 return unless $visible;
2775
2776 $self->{root}->on_post_alloc ("move_$self" => sub {
2777 my $widget = $self->{owner}
2778 or return;
2779
2780 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2781
2782 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2783 if $x + $self->{w} > $::WIDTH;
2784
2785 $self->move_abs ($x, $y);
2786 });
2650} 2787}
2651 2788
2652sub _draw { 2789sub _draw {
2653 my ($self) = @_; 2790 my ($self) = @_;
2654 2791
… …
2671 glVertex $w, $h; 2808 glVertex $w, $h;
2672 glVertex $w, 0; 2809 glVertex $w, 0;
2673 glEnd; 2810 glEnd;
2674 2811
2675 glTranslate 2 - 0.375, 2 - 0.375; 2812 glTranslate 2 - 0.375, 2 - 0.375;
2813
2676 $self->SUPER::_draw; 2814 $self->SUPER::_draw;
2677} 2815}
2678 2816
2679############################################################################# 2817#############################################################################
2680 2818
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2877 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 2878
2741 if ($tex) { 2879 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 2880 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2881 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 2882 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2883 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 2884 glDisable GL_TEXTURE_2D;
2747 } 2885 }
2748} 2886}
2749 2887
… …
2756 $self->SUPER::DESTROY; 2894 $self->SUPER::DESTROY;
2757} 2895}
2758 2896
2759############################################################################# 2897#############################################################################
2760 2898
2761package CFClient::UI::Inventory; 2899package CFClient::UI::Buttonbar;
2762 2900
2763our @ISA = CFClient::UI::ScrolledWindow::; 2901our @ISA = CFClient::UI::HBox::;
2764 2902
2765sub new { 2903# TODO: should actualyl wrap buttons and other goodies.
2766 my $class = shift;
2767
2768 my $self = $class->SUPER::new (
2769 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2770 @_,
2771 );
2772
2773 $self
2774}
2775
2776sub set_items {
2777 my ($self, $items) = @_;
2778
2779 $self->{scrolled}->clear;
2780 return unless $items;
2781
2782 my @items = sort {
2783 ($a->{type} <=> $b->{type})
2784 or ($a->{name} cmp $b->{name})
2785 } @$items;
2786
2787 $self->{real_items} = \@items;
2788
2789 my $row = 0;
2790 for my $item (@items) {
2791 CFClient::Item::update_widgets $item;
2792
2793 $self->{scrolled}->add (0, $row, $item->{face_widget});
2794 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2795 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2796
2797 $row++;
2798 }
2799}
2800
2801sub size_request {
2802 my ($self) = @_;
2803 ($self->{req_w}, $self->{req_h});
2804}
2805 2904
2806############################################################################# 2905#############################################################################
2807 2906
2808package CFClient::UI::Menu; 2907package CFClient::UI::Menu;
2809 2908
… …
2850 # maybe save $GRAB? must be careful about events... 2949 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2950 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2951 $self->{button} = $ev->{button};
2853 2952
2854 $self->show; 2953 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2954 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856} 2955}
2857 2956
2858sub mouse_motion { 2957sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2958 my ($self, $ev, $x, $y) = @_;
2860 2959
2861 # TODO: should use vbox->find_widget or so 2960 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2961 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 2962 $self->{hover} = $self->{item}{$HOVER};
2963
2964 0
2864} 2965}
2865 2966
2866sub button_up { 2967sub button_up {
2867 my ($self, $ev, $x, $y) = @_; 2968 my ($self, $ev, $x, $y) = @_;
2868 2969
… …
2870 undef $GRAB; 2971 undef $GRAB;
2871 $self->hide; 2972 $self->hide;
2872 2973
2873 $self->_emit ("popdown"); 2974 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 2975 $self->{hover}[1]->() if $self->{hover};
2976 } else {
2977 return 0
2978 }
2979
2875 } 2980 1
2876} 2981}
2877 2982
2878############################################################################# 2983#############################################################################
2879 2984
2880package CFClient::UI::Statusbox; 2985package CFClient::UI::Multiplexer;
2881 2986
2882our @ISA = CFClient::UI::VBox::; 2987our @ISA = CFClient::UI::Container::;
2883 2988
2884sub new { 2989sub new {
2885 my $class = shift; 2990 my $class = shift;
2886 2991
2887 $class->SUPER::new ( 2992 my $self = $class->SUPER::new (
2993 @_,
2994 );
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998
2999 $self
3000}
3001
3002sub add {
3003 my ($self, @widgets) = @_;
3004
3005 $self->SUPER::add (@widgets);
3006
3007 $self->{current} = $self->{children}[0]
3008 if @{ $self->{children} };
3009}
3010
3011sub set_current_page {
3012 my ($self, $page_or_widget) = @_;
3013
3014 my $widget = ref $page_or_widget
3015 ? $page_or_widget
3016 : $self->{children}[$page_or_widget];
3017
3018 $self->{current} = $widget;
3019 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3020
3021 $self->_emit (page_changed => $self->{current});
3022
3023 $self->realloc;
3024}
3025
3026sub visible_children {
3027 $_[0]{current}
3028}
3029
3030sub size_request {
3031 my ($self) = @_;
3032
3033 $self->{current}->size_request
3034}
3035
3036sub size_allocate {
3037 my ($self, $w, $h) = @_;
3038
3039 $self->{current}->configure (0, 0, $w, $h);
3040}
3041
3042sub _draw {
3043 my ($self) = @_;
3044
3045 $self->{current}->draw;
3046}
3047
3048#############################################################################
3049
3050package CFClient::UI::Notebook;
3051
3052our @ISA = CFClient::UI::VBox::;
3053
3054sub new {
3055 my $class = shift;
3056
3057 my $self = $class->SUPER::new (
3058 buttonbar => (new CFClient::UI::Buttonbar),
3059 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3060 # filter => # will be put between multiplexer and $self
3061 @_,
3062 );
3063
3064 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3065 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3066
3067 $self
3068}
3069
3070sub add {
3071 my ($self, $title, $widget, $tooltip) = @_;
3072
3073 Scalar::Util::weaken $self;
3074
3075 $self->{buttonbar}->add (new CFClient::UI::Button
3076 markup => $title,
3077 tooltip => $tooltip,
3078 on_activate => sub { $self->set_current_page ($widget) },
3079 );
3080
3081 $self->{multiplexer}->add ($widget);
3082}
3083
3084sub set_current_page {
3085 my ($self, $page) = @_;
3086
3087 $self->{multiplexer}->set_current_page ($page);
3088 $self->_emit (page_changed => $self->{multiplexer}{current});
3089}
3090
3091#############################################################################
3092
3093package CFClient::UI::Statusbox;
3094
3095our @ISA = CFClient::UI::VBox::;
3096
3097sub new {
3098 my $class = shift;
3099
3100 my $self = $class->SUPER::new (
2888 fontsize => 0.8, 3101 fontsize => 0.8,
2889 @_, 3102 @_,
2890 ) 3103 );
3104
3105 Scalar::Util::weaken (my $this = $self);
3106
3107 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3108
3109 $self
2891} 3110}
2892 3111
2893sub reorder { 3112sub reorder {
2894 my ($self) = @_; 3113 my ($self) = @_;
2895 my $NOW = time; 3114 my $NOW = Time::HiRes::time;
3115
3116 # freeze display when hovering over any label
3117 return if $CFClient::UI::TOOLTIP->{owner}
3118 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3119 values %{ $self->{item} };
2896 3120
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3121 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3122 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3123 }
2900 3124
… …
2903 my @items = sort { 3127 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3128 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3129 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3130 } values %{ $self->{item} };
2907 3131
3132 $self->{timer}->interval (1);
3133
2908 my $count = 10 + 1; 3134 my $count = 10 + 1;
2909 for my $item (@items) { 3135 for my $item (@items) {
2910 last unless --$count; 3136 last unless --$count;
2911 3137
2912 push @widgets, $item->{label} ||= do { 3138 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3139 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3140 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3141 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3142 : $item->{text};
2917 3143
… …
2925 tooltip => $item->{tooltip}, 3151 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3152 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3153 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3154 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3155 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3156 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3157 can_events => 1,
2932 can_hover => 1 3158 can_hover => 1
2933 }; 3159 };
3160
3161 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3162 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3163 $label->update;
3164 $label->set_max_size (undef, $label->{req_h} * $diff)
3165 if $diff < 1;
3166 $self->{timer}->interval (1/30);
3167 } else {
3168 $label->{fg}[3] = $item->{fg}[3] || 1;
3169 }
3170
3171 push @widgets, $label;
2934 } 3172 }
2935 3173
2936 $self->clear; 3174 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3175 $self->SUPER::add (reverse @widgets);
2938} 3176}
… …
2943 $text =~ s/^\s+//; 3181 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3182 $text =~ s/\s+$//;
2945 3183
2946 return unless $text; 3184 return unless $text;
2947 3185
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3186 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3187
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3188 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3189
2952 if (my $item = $self->{item}{$group}) { 3190 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3191 if ($item->{text} eq $text) {
… …
2983 3221
2984 $self->reorder; 3222 $self->reorder;
2985 $self->SUPER::reconfigure; 3223 $self->SUPER::reconfigure;
2986} 3224}
2987 3225
3226sub DESTROY {
3227 my ($self) = @_;
3228
3229 $self->{timer}->cancel;
3230
3231 $self->SUPER::DESTROY;
3232}
3233
2988############################################################################# 3234#############################################################################
2989 3235
2990package CFClient::UI::Root; 3236package CFClient::UI::Inventory;
2991 3237
2992our @ISA = CFClient::UI::Container::; 3238our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3239
2996sub new { 3240sub new {
2997 my $class = shift; 3241 my $class = shift;
2998 3242
2999 $class->SUPER::new ( 3243 my $self = $class->SUPER::new (
3244 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3245 @_,
3246 );
3247
3248 $self
3249}
3250
3251sub set_items {
3252 my ($self, $items) = @_;
3253
3254 $self->{child}->clear;
3255 return unless $items;
3256
3257 my @items = sort {
3258 ($a->{type} <=> $b->{type})
3259 or ($a->{name} cmp $b->{name})
3260 } @$items;
3261
3262 $self->{real_items} = \@items;
3263
3264 my $row = 0;
3265 for my $item (@items) {
3266 CFClient::Item::update_widgets $item;
3267
3268 $self->{child}->add (0, $row, $item->{face_widget});
3269 $self->{child}->add (1, $row, $item->{desc_widget});
3270 $self->{child}->add (2, $row, $item->{weight_widget});
3271
3272 $row++;
3273 }
3274}
3275
3276#############################################################################
3277
3278package CFClient::UI::BindEditor;
3279
3280our @ISA = CFClient::UI::FancyFrame::;
3281
3282sub new {
3283 my $class = shift;
3284
3285 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3286
3287 $self->add (my $vb = new CFClient::UI::VBox);
3288
3289
3290 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3291 text => "start recording",
3292 tooltip => "Start/Stops recording of actions."
3293 ."All subsequent actions after the recording started will be captured."
3294 ."The actions are displayed after the record was stopped."
3295 ."To bind the action you have to click on the 'Bind' button",
3296 on_activate => sub {
3297 unless ($self->{recording}) {
3298 $self->start;
3299 } else {
3300 $self->stop;
3301 }
3302 });
3303
3304 $vb->add (new CFClient::UI::Label text => "Actions:");
3305 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3306
3307 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3308 $vb->add (my $hb = new CFClient::UI::HBox);
3309 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3310 $hb->add (new CFClient::UI::Button
3311 text => "bind",
3312 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3313 on_activate => sub {
3314 $self->ask_for_bind;
3315 });
3316
3317 $vb->add (my $hb = new CFClient::UI::HBox);
3318 $hb->add (new CFClient::UI::Button
3319 text => "ok",
3320 expand => 1,
3321 tooltip => "This closes the binding editor and saves the binding",
3322 on_activate => sub {
3323 $self->hide;
3324 $self->commit;
3325 });
3326
3327 $hb->add (new CFClient::UI::Button
3328 text => "cancel",
3329 expand => 1,
3330 tooltip => "This closes the binding editor without saving",
3331 on_activate => sub {
3332 $self->hide;
3333 $self->{binding_cancel}->()
3334 if $self->{binding_cancel};
3335 });
3336
3337 $self->update_binding_widgets;
3338
3339 $self
3340}
3341
3342sub commit {
3343 my ($self) = @_;
3344 my ($mod, $sym, $cmds) = $self->get_binding;
3345 if ($sym != 0 && @$cmds > 0) {
3346 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3347 ."'. Don't forget 'Save Config'!");
3348 $self->{binding_change}->($mod, $sym, $cmds)
3349 if $self->{binding_change};
3350 } else {
3351 $::STATUSBOX->add ("No action bound, no key or action specified!");
3352 $self->{binding_cancel}->()
3353 if $self->{binding_cancel};
3354 }
3355}
3356
3357sub start {
3358 my ($self) = @_;
3359
3360 $self->{rec_btn}->set_text ("stop recording");
3361 $self->{recording} = 1;
3362 $self->clear_command_list;
3363 $::CONN->start_record if $::CONN;
3364}
3365
3366sub stop {
3367 my ($self) = @_;
3368
3369 $self->{rec_btn}->set_text ("start recording");
3370 $self->{recording} = 0;
3371
3372 my $rec;
3373 $rec = $::CONN->stop_record if $::CONN;
3374 return unless ref $rec eq 'ARRAY';
3375 $self->set_command_list ($rec);
3376}
3377
3378
3379sub ask_for_bind_and_commit {
3380 my ($self) = @_;
3381 $self->ask_for_bind (1);
3382}
3383
3384sub ask_for_bind {
3385 my ($self, $commit) = @_;
3386
3387 CFClient::Binder::open_binding_dialog (sub {
3388 my ($mod, $sym) = @_;
3389 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3390 $self->update_binding_widgets;
3391 $self->commit if $commit;
3392 });
3393}
3394
3395# $mod and $sym are the modifiers and key symbol
3396# $cmds is a array ref of strings (the commands)
3397# $cb is the callback that is executed on OK
3398# $ccb is the callback that is executed on CANCEL and
3399# when the binding was unsuccessful on OK
3400sub set_binding {
3401 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3402
3403 $self->clear_command_list;
3404 $self->{recording} = 0;
3405 $self->{rec_btn}->set_text ("start recording");
3406
3407 $self->{binding} = [$mod, $sym];
3408 $self->{commands} = $cmds;
3409
3410 $self->{binding_change} = $cb;
3411 $self->{binding_cancel} = $ccb;
3412
3413 $self->update_binding_widgets;
3414}
3415
3416# this is a shortcut method that asks for a binding
3417# and then just binds it.
3418sub do_quick_binding {
3419 my ($self, $cmds) = @_;
3420 $self->set_binding (undef, undef, $cmds, sub {
3421 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3422 });
3423 $self->ask_for_bind (1);
3424}
3425
3426sub update_binding_widgets {
3427 my ($self) = @_;
3428 my ($mod, $sym, $cmds) = $self->get_binding;
3429 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3430 $self->set_command_list ($cmds);
3431}
3432
3433sub get_binding {
3434 my ($self) = @_;
3435 return (
3436 $self->{binding}->[0],
3437 $self->{binding}->[1],
3438 [ grep { defined $_ } @{$self->{commands}} ]
3439 );
3440}
3441
3442sub clear_command_list {
3443 my ($self) = @_;
3444 $self->{cmdbox}->clear ();
3445}
3446
3447sub set_command_list {
3448 my ($self, $cmds) = @_;
3449
3450 $self->{cmdbox}->clear ();
3451 $self->{commands} = $cmds;
3452
3453 my $idx = 0;
3454
3455 for (@$cmds) {
3456 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3457
3458 my $i = $idx;
3459 $hb->add (new CFClient::UI::Label text => $_);
3460 $hb->add (new CFClient::UI::Button
3461 text => "delete",
3462 tooltip => "Deletes the action from the record",
3463 on_activate => sub {
3464 $self->{cmdbox}->remove ($hb);
3465 $cmds->[$i] = undef;
3466 });
3467
3468
3469 $idx++
3470 }
3471}
3472
3473#############################################################################
3474
3475package CFClient::UI::SpellList;
3476
3477our @ISA = CFClient::UI::Table::;
3478
3479sub new {
3480 my $class = shift;
3481
3482 my $self = $class->SUPER::new (
3483 binding => [],
3484 commands => [],
3485 @_,
3486 )
3487}
3488
3489my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3490 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
3491my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3492 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
3493my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3494 "<b>Damage</b>. The amount of damage the spell deals when it hits.");
3495
3496sub rebuild_spell_list {
3497 my ($self) = @_;
3498
3499 $CFClient::UI::ROOT->on_refresh ($self => sub {
3500 $self->clear;
3501
3502 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
3503 $self->add (2, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3504 $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3505 $self->add (4, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3506
3507 my $row = 0;
3508
3509 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3510 my $spell = $self->{spell}{$_};
3511
3512 $row++;
3513
3514 $self->add (0, $row, new CFClient::UI::Face
3515 face => $spell->{face},
3516 can_hover => 1,
3517 can_events => 1,
3518 tooltip => $spell->{message},
3519 );
3520
3521 $self->add (1, $row, new CFClient::UI::Label
3522 expand => 1,
3523 text => $spell->{name},
3524 can_hover => 1,
3525 can_events => 1,
3526 tooltip => $spell->{message},
3527 );
3528
3529 $self->add (2, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3530 $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3531 $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3532
3533 # TODO: should be done via popup
3534 $self->add (5, $row, new CFClient::UI::Button
3535 text => "bind",
3536 tooltip => "bind spell readying (cast command) to key",
3537 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
3538 );
3539 }
3540 });
3541}
3542
3543sub add_spell {
3544 my ($self, $spell) = @_;
3545
3546 $self->{spell}->{$spell->{name}} = $spell;
3547 $self->rebuild_spell_list;
3548}
3549
3550sub remove_spell {
3551 my ($self, $spell) = @_;
3552
3553 delete $self->{spell}->{$spell->{name}};
3554 $self->rebuild_spell_list;
3555}
3556
3557#############################################################################
3558
3559package CFClient::UI::Root;
3560
3561our @ISA = CFClient::UI::Container::;
3562
3563use List::Util qw(min max);
3564
3565use CFClient::OpenGL;
3566
3567sub new {
3568 my $class = shift;
3569
3570 my $self = $class->SUPER::new (
3000 visible => 1, 3571 visible => 1,
3001 @_, 3572 @_,
3002 ) 3573 );
3003}
3004 3574
3005sub configure { 3575 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3576
3008 $self->{w} = $w; 3577 $self
3009 $self->{h} = $h;
3010}
3011
3012sub check_size {
3013 my ($self) = @_;
3014
3015 $self->size_allocate ($self->{w}, $self->{h})
3016 if $self->{w};
3017} 3578}
3018 3579
3019sub size_request { 3580sub size_request {
3020 my ($self) = @_; 3581 my ($self) = @_;
3021 3582
3022 ($self->{w}, $self->{h}) 3583 ($self->{w}, $self->{h})
3584}
3585
3586sub _to_pixel {
3587 my ($coord, $size, $max) = @_;
3588
3589 $coord =
3590 $coord eq "center" ? ($max - $size) * 0.5
3591 : $coord eq "max" ? $max
3592 : $coord;
3593
3594 $coord = 0 if $coord < 0;
3595 $coord = $max - $size if $coord > $max - $size;
3596
3597 int $coord + 0.5
3023} 3598}
3024 3599
3025sub size_allocate { 3600sub size_allocate {
3026 my ($self, $w, $h) = @_; 3601 my ($self, $w, $h) = @_;
3027 3602
3028 for my $child ($self->children) { 3603 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3604 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3605
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3606 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3607 $Y = $child->{force_y} if exists $child->{force_y};
3033 3608
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3609 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3610 $Y = _to_pixel $Y, $H, $self->{h};
3036
3037 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3038 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3039 3611
3040 $child->configure ($X, $Y, $W, $H); 3612 $child->configure ($X, $Y, $W, $H);
3041 } 3613 }
3042} 3614}
3043 3615
… …
3054} 3626}
3055 3627
3056sub update { 3628sub update {
3057 my ($self) = @_; 3629 my ($self) = @_;
3058 3630
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3631 $::WANT_REFRESH++;
3061} 3632}
3062 3633
3063sub add { 3634sub add {
3064 my ($self, @children) = @_; 3635 my ($self, @children) = @_;
3065 3636
3066 for (my @widgets = @children; my $w = pop @widgets; ) {
3067 push @widgets, $w->children;
3068 $w->{root} = $self;
3069 $w->{visible} = $self->{visible} + 1;
3070 }
3071
3072 for my $child (@children) {
3073 $child->{is_toplevel} = 1; 3637 $_->{is_toplevel} = 1
3074 3638 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3639
3080 $self->SUPER::add (@children); 3640 $self->SUPER::add (@children);
3081} 3641}
3082 3642
3083sub remove { 3643sub remove {
3084 my ($self, @children) = @_; 3644 my ($self, @children) = @_;
3085 3645
3086 $self->SUPER::remove (@children); 3646 $self->SUPER::remove (@children);
3647
3648 delete $self->{is_toplevel}
3649 for @children;
3087 3650
3088 while (@children) { 3651 while (@children) {
3089 my $w = pop @children; 3652 my $w = pop @children;
3090 push @children, $w->children; 3653 push @children, $w->children;
3091 $w->set_invisible; 3654 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3673 while ($self->{refresh_hook}) {
3111 $_->() 3674 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3675 for values %{delete $self->{refresh_hook}};
3113 } 3676 }
3114 3677
3115 if ($self->{check_size}) { 3678 if ($self->{realloc}) {
3679 my %queue;
3116 my @queue; 3680 my @queue;
3681 my $widget;
3117 3682
3118 for (;;) { 3683 outer:
3119 if ($self->{check_size}) { 3684 while () {
3120 #TODO use array-of-depth approach 3685 if (my $realloc = delete $self->{realloc}) {
3686 for $widget (values %$realloc) {
3687 $widget->{visible} or next; # do not resize invisible widgets
3121 3688
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3689 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3690
3691 push @{ $queue[$widget->{visible}] }, $widget;
3692 }
3124 } 3693 }
3125 3694
3695 while () {
3696 @queue or last outer;
3697
3126 my $widget = pop @queue || last; 3698 $widget = pop @{ $queue[-1] || [] }
3127 3699 and last;
3128 defined $widget->{visible} or last; # do not resize invisible widgets
3129
3130 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3131 ? @$widget{qw(user_w user_h)}
3132 : $widget->size_request;
3133
3134 if (delete $widget->{force_alloc}
3135 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3136 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3137 3700
3701 pop @queue;
3702 }
3703
3704 delete $queue{$widget+0};
3705
3706 my ($w, $h) = $widget->size_request;
3707
3708 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3709 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3710
3711 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3712 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3713
3714 $w = $widget->{force_w} if exists $widget->{force_w};
3715 $h = $widget->{force_h} if exists $widget->{force_h};
3716
3717 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3718 || delete $widget->{force_realloc}) {
3138 $widget->{req_w} = $w; 3719 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3720 $widget->{req_h} = $h;
3140 3721
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3722 $self->{size_alloc}{$widget+0} = $widget;
3142 3723
3143 $widget->{parent}->check_size
3144 if $widget->{parent}; 3724 if (my $parent = $widget->{parent}) {
3725 $self->{realloc}{$parent+0} = $parent
3726 unless $queue{$parent+0};
3727
3728 $parent->{force_size_alloc} = 1;
3729 $self->{size_alloc}{$parent+0} = $parent;
3730 }
3145 } 3731 }
3732
3733 delete $self->{realloc}{$widget+0};
3146 } 3734 }
3147 } 3735 }
3148 3736
3149 while ($self->{size_alloc}) { 3737 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3738 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 my ($widget, $w, $h) = @$_; 3739 values %$size_alloc;
3740
3741 while () {
3742 my $widget = pop @queue || last;
3743
3744 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152 3745
3153 $w = 0 if $w < 0; 3746 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3747 $h = 0 if $h < 0;
3155 3748
3749 $w = int $w + 0.5;
3750 $h = int $h + 0.5;
3751
3752 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3753 $widget->{old_w} = $widget->{w};
3754 $widget->{old_h} = $widget->{h};
3755
3156 $widget->{w} = $w; 3756 $widget->{w} = $w;
3157 $widget->{h} = $h; 3757 $widget->{h} = $h;
3758
3158 $widget->emit (size_allocate => $w, $h); 3759 $widget->emit (size_allocate => $w, $h);
3760 }
3159 } 3761 }
3160 } 3762 }
3161 3763
3162 while ($self->{post_alloc_hook}) { 3764 while ($self->{post_alloc_hook}) {
3163 $_->() 3765 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3766 for values %{delete $self->{post_alloc_hook}};
3165 } 3767 }
3768
3166 3769
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3770 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3771 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3772 glClear GL_COLOR_BUFFER_BIT;
3170 3773
… …
3172 glLoadIdentity; 3775 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3776 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3777 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3778 glLoadIdentity;
3176 3779
3780 {
3781 package CFClient::UI::Base;
3782
3783 ($draw_x, $draw_y, $draw_w, $draw_h) =
3784 (0, 0, $self->{w}, $self->{h});
3785 }
3786
3177 $self->_draw; 3787 $self->_draw;
3178} 3788}
3179 3789
3180############################################################################# 3790#############################################################################
3181 3791

Diff Legend

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