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.288 by root, Mon Jun 5 21:14:40 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
10use CFClient::Texture; 11use CFClient::Texture;
11 12
12our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
… …
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 # some widgets cache req_w and req_h
532 delete $self->{req_w};
533 delete $self->{req_h};
534
535 $self->realloc;
536 $self->update;
537}
538
539# using global variables seems a bit hacky, but passing through all drawing
540# functions seems pointless.
541our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
427 542
428sub draw { 543sub draw {
429 my ($self) = @_; 544 my ($self) = @_;
430 545
431 return unless $self->{h} && $self->{w}; 546 return unless $self->{h} && $self->{w};
547
548 # update screen rectangle
549 local $draw_x = $draw_x + $self->{x};
550 local $draw_y = $draw_y + $self->{y};
551 local $draw_w = $draw_x + $self->{w};
552 local $draw_h = $draw_y + $self->{h};
553
554 # skip widgets that are entirely outside the drawing area
555 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
556 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
432 557
433 glPushMatrix; 558 glPushMatrix;
434 glTranslate $self->{x}, $self->{y}, 0; 559 glTranslate $self->{x}, $self->{y}, 0;
435 $self->_draw;
436 glPopMatrix;
437 560
438 if ($self == $HOVER && $self->{can_hover}) { 561 if ($self == $HOVER && $self->{can_hover}) {
439 my ($x, $y) = @$self{qw(x y)};
440
441 glColor 1, 0.8, 0.5, 0.2; 562 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
442 glEnable GL_BLEND; 563 glEnable GL_BLEND;
443 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 564 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
444 glBegin GL_QUADS; 565 glBegin GL_QUADS;
445 glVertex $x , $y; 566 glVertex 0 , 0;
446 glVertex $x + $self->{w}, $y; 567 glVertex $self->{w}, 0;
447 glVertex $x + $self->{w}, $y + $self->{h}; 568 glVertex $self->{w}, $self->{h};
448 glVertex $x , $y + $self->{h}; 569 glVertex 0 , $self->{h};
449 glEnd; 570 glEnd;
450 glDisable GL_BLEND; 571 glDisable GL_BLEND;
451 } 572 }
452 573
453 if ($ENV{PCLIENT_DEBUG}) { 574 if ($ENV{CFPLUS_DEBUG} & 1) {
454 glPushMatrix; 575 glPushMatrix;
455 glColor 1, 1, 0, 1; 576 glColor 1, 1, 0, 1;
456 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 577 glTranslate 0.375, 0.375;
457 glBegin GL_LINE_LOOP; 578 glBegin GL_LINE_LOOP;
458 glVertex 0 , 0; 579 glVertex 0 , 0;
459 glVertex $self->{w} - 1, 0; 580 glVertex $self->{w} - 1, 0;
460 glVertex $self->{w} - 1, $self->{h} - 1; 581 glVertex $self->{w} - 1, $self->{h} - 1;
461 glVertex 0 , $self->{h} - 1; 582 glVertex 0 , $self->{h} - 1;
462 glEnd; 583 glEnd;
463 glPopMatrix; 584 glPopMatrix;
464 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 585 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
465 } 586 }
587
588 $self->_draw;
589 glPopMatrix;
466} 590}
467 591
468sub _draw { 592sub _draw {
469 my ($self) = @_; 593 my ($self) = @_;
470 594
471 warn "no draw defined for $self\n"; 595 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} 596}
533 597
534sub DESTROY { 598sub DESTROY {
535 my ($self) = @_; 599 my ($self) = @_;
536 600
… …
568 632
569 if ($color && (@$color < 4 || $color->[3])) { 633 if ($color && (@$color < 4 || $color->[3])) {
570 my ($w, $h) = @$self{qw(w h)}; 634 my ($w, $h) = @$self{qw(w h)};
571 635
572 glEnable GL_BLEND; 636 glEnable GL_BLEND;
573 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 637 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
574 glColor @$color; 638 glColor_premultiply @$color;
575 639
576 glBegin GL_QUADS; 640 glBegin GL_QUADS;
577 glVertex 0 , 0; 641 glVertex 0 , 0;
578 glVertex 0 , $h; 642 glVertex 0 , $h;
579 glVertex $w, $h; 643 glVertex $w, $h;
… …
594 my ($class, %arg) = @_; 658 my ($class, %arg) = @_;
595 $class->SUPER::new (can_events => 0, %arg); 659 $class->SUPER::new (can_events => 0, %arg);
596} 660}
597 661
598sub size_request { 662sub size_request {
599 (0, 0) 663 my ($self) = @_;
664
665 ($self->{w} + 0, $self->{h} + 0)
600} 666}
601 667
602sub draw { } 668sub draw { }
603 669
604############################################################################# 670#############################################################################
… …
608our @ISA = CFClient::UI::Base::; 674our @ISA = CFClient::UI::Base::;
609 675
610sub new { 676sub new {
611 my ($class, %arg) = @_; 677 my ($class, %arg) = @_;
612 678
613 my $children = delete $arg{children} || []; 679 my $children = delete $arg{children};
614 680
615 my $self = $class->SUPER::new ( 681 my $self = $class->SUPER::new (
616 children => [], 682 children => [],
617 can_events => 0, 683 can_events => 0,
618 %arg, 684 %arg,
619 ); 685 );
686
620 $self->add ($_) for @$children; 687 $self->add (@$children)
688 if $children;
621 689
622 $self 690 $self
623} 691}
624 692
625sub add { 693sub add {
… …
633 $self->{children} = [ 701 $self->{children} = [
634 sort { $a->{z} <=> $b->{z} } 702 sort { $a->{z} <=> $b->{z} }
635 @{$self->{children}}, @widgets 703 @{$self->{children}}, @widgets
636 ]; 704 ];
637 705
638 $self->check_size (1); 706 $self->realloc;
639 $self->update;
640} 707}
641 708
642sub children { 709sub children {
643 @{ $_[0]{children} } 710 @{ $_[0]{children} }
644} 711}
… …
649 delete $child->{parent}; 716 delete $child->{parent};
650 $child->hide; 717 $child->hide;
651 718
652 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 719 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
653 720
654 $self->check_size (1); 721 $self->realloc;
655 $self->update;
656} 722}
657 723
658sub clear { 724sub clear {
659 my ($self) = @_; 725 my ($self) = @_;
660 726
… …
664 for (@$children) { 730 for (@$children) {
665 delete $_->{parent}; 731 delete $_->{parent};
666 $_->hide; 732 $_->hide;
667 } 733 }
668 734
669 $self->check_size; 735 $self->realloc;
670 $self->update;
671} 736}
672 737
673sub find_widget { 738sub find_widget {
674 my ($self, $x, $y) = @_; 739 my ($self, $x, $y) = @_;
675 740
676 $x -= $self->{x}; 741 $x -= $self->{x};
677 $y -= $self->{y}; 742 $y -= $self->{y};
678 743
679 my $res; 744 my $res;
680 745
681 for (reverse @{ $self->{children} }) { 746 for (reverse $self->visible_children) {
682 $res = $_->find_widget ($x, $y) 747 $res = $_->find_widget ($x, $y)
683 and return $res; 748 and return $res;
684 } 749 }
685 750
686 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 751 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
735 $self->{children}[0]->configure (0, 0, $w, $h); 800 $self->{children}[0]->configure (0, 0, $w, $h);
736} 801}
737 802
738############################################################################# 803#############################################################################
739 804
805# back-buffered drawing area
806
740package CFClient::UI::Window; 807package CFClient::UI::Window;
741 808
742our @ISA = CFClient::UI::Bin::; 809our @ISA = CFClient::UI::Bin::;
743 810
744use CFClient::OpenGL; 811use CFClient::OpenGL;
… …
762 $self->SUPER::size_allocate ($w, $h); 829 $self->SUPER::size_allocate ($w, $h);
763 $self->update; 830 $self->update;
764} 831}
765 832
766sub _render { 833sub _render {
834 my ($self) = @_;
835
767 $_[0]{children}[0]->draw; 836 $self->{children}[0]->draw;
768} 837}
769 838
770sub render_child { 839sub render_child {
771 my ($self) = @_; 840 my ($self) = @_;
772 841
773 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 842 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
774 glClearColor 0, 0, 0, 0; 843 glClearColor 0, 0, 0, 0;
775 glClear GL_COLOR_BUFFER_BIT; 844 glClear GL_COLOR_BUFFER_BIT;
776 845
846 {
847 package CFClient::UI::Base;
848
849 ($draw_x, $draw_y, $draw_w, $draw_h) =
850 (0, 0, $self->{w}, $self->{h});
851 }
852
777 $self->_render; 853 $self->_render;
778 }; 854 };
779} 855}
780 856
781sub _draw { 857sub _draw {
782 my ($self) = @_; 858 my ($self) = @_;
783 859
784 my ($w, $h) = ($self->w, $self->h); 860 my ($w, $h) = @$self{qw(w h)};
785 861
786 my $tex = $self->{texture} 862 my $tex = $self->{texture}
787 or return; 863 or return;
788 864
789 glEnable GL_TEXTURE_2D; 865 glEnable GL_TEXTURE_2D;
790 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 866 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
791 glColor 1, 1, 1, 1; 867 glColor 0, 0, 0, 1;
792 868
793 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 869 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
794 870
795 glDisable GL_TEXTURE_2D; 871 glDisable GL_TEXTURE_2D;
796} 872}
… …
812} 888}
813 889
814sub size_request { 890sub size_request {
815 my ($self) = @_; 891 my ($self) = @_;
816 892
817 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 893 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
818 894
819 @$self{qw(child_w child_h)} 895 $w = 10 if $self->{scroll_x};
896 $h = 10 if $self->{scroll_y};
897
898 ($w, $h)
820} 899}
821 900
822sub size_allocate { 901sub size_allocate {
823 my ($self, $w, $h) = @_; 902 my ($self, $w, $h) = @_;
824 903
904 my $child = $self->child;
905
825 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 906 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
826 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 907 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
827 908
828 $self->child->configure (0, 0, $w, $h); 909 $self->child->configure (0, 0, $w, $h);
829 $self->update; 910 $self->update;
830} 911}
831 912
… …
867} 948}
868 949
869sub _render { 950sub _render {
870 my ($self) = @_; 951 my ($self) = @_;
871 952
953 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
954 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
955
872 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 956 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
873 957
874 $self->SUPER::_render; 958 $self->SUPER::_render;
875} 959}
876 960
… …
879package CFClient::UI::ScrolledWindow; 963package CFClient::UI::ScrolledWindow;
880 964
881our @ISA = CFClient::UI::HBox::; 965our @ISA = CFClient::UI::HBox::;
882 966
883sub new { 967sub new {
884 my $class = shift; 968 my ($class, %arg) = @_;
969
970 my $child = delete $arg{child};
885 971
886 my $self; 972 my $self;
887 973
888 my $slider = new CFClient::UI::Slider 974 my $slider = new CFClient::UI::Slider
889 vertical => 1, 975 vertical => 1,
… …
894 ; 980 ;
895 981
896 $self = $class->SUPER::new ( 982 $self = $class->SUPER::new (
897 vp => (new CFClient::UI::ViewPort expand => 1), 983 vp => (new CFClient::UI::ViewPort expand => 1),
898 slider => $slider, 984 slider => $slider,
899 @_, 985 %arg,
900 ); 986 );
901 987
902 $self->{vp}->add ($self->{scrolled});
903 $self->add ($self->{vp});
904 $self->add ($self->{slider}); 988 $self->SUPER::add ($self->{vp}, $self->{slider});
989 $self->add ($child) if $child;
905 990
906 $self 991 $self
992}
993
994sub add {
995 my ($self, $widget) = @_;
996
997 $self->{vp}->add ($self->{child} = $widget);
907} 998}
908 999
909sub update { 1000sub update {
910 my ($self) = @_; 1001 my ($self) = @_;
911 1002
… …
950 1041
951 if ($self->{bg}) { 1042 if ($self->{bg}) {
952 my ($w, $h) = @$self{qw(w h)}; 1043 my ($w, $h) = @$self{qw(w h)};
953 1044
954 glEnable GL_BLEND; 1045 glEnable GL_BLEND;
955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1046 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
956 glColor @{ $self->{bg} }; 1047 glColor_premultiply @{ $self->{bg} };
957 1048
958 glBegin GL_QUADS; 1049 glBegin GL_QUADS;
959 glVertex 0 , 0; 1050 glVertex 0 , 0;
960 glVertex 0 , $h; 1051 glVertex 0 , $h;
961 glVertex $w, $h; 1052 glVertex $w, $h;
… …
974 1065
975our @ISA = CFClient::UI::Bin::; 1066our @ISA = CFClient::UI::Bin::;
976 1067
977use CFClient::OpenGL; 1068use CFClient::OpenGL;
978 1069
979my @tex = 1070my $bg =
1071 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1072 mipmap => 1, wrap => 1;
1073
1074my @border =
980 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1075 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); 1076 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
982 1077
983sub new { 1078sub new {
984 my $class = shift; 1079 my ($class, %arg) = @_;
985 1080
986 # TODO: user_x, user_y, overwrite moveto? 1081 my $title = delete $arg{title};
987 1082
988 my $self = $class->SUPER::new ( 1083 my $self = $class->SUPER::new (
989 bg => [1, 1, 1, 1], 1084 bg => [1, 1, 1, 1],
990 border_bg => [1, 1, 1, 1], 1085 border_bg => [1, 1, 1, 1],
991 border => 0.6, 1086 border => 0.6,
992 is_toplevel => 1,
993 can_events => 1, 1087 can_events => 1,
994 @_ 1088 min_w => 16,
1089 min_h => 16,
1090 %arg,
995 ); 1091 );
996 1092
997 $self->{title} &&= new CFClient::UI::Label 1093 $self->{title} = new CFClient::UI::Label
998 align => 0, 1094 align => 0,
999 valign => 1, 1095 valign => 1,
1000 text => $self->{title}, 1096 text => $title,
1001 fontsize => $self->{border}; 1097 fontsize => $self->{border}
1098 if defined $title;
1002 1099
1003 $self 1100 $self
1101}
1102
1103sub add {
1104 my ($self, @widgets) = @_;
1105
1106 $self->SUPER::add (@widgets);
1107 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
1004} 1108}
1005 1109
1006sub border { 1110sub border {
1007 int $_[0]{border} * $::FONTSIZE 1111 int $_[0]{border} * $::FONTSIZE
1008} 1112}
1009 1113
1010sub size_request { 1114sub size_request {
1011 my ($self) = @_; 1115 my ($self) = @_;
1116
1117 $self->{title}->size_request
1118 if $self->{title};
1012 1119
1013 my ($w, $h) = $self->SUPER::size_request; 1120 my ($w, $h) = $self->SUPER::size_request;
1014 1121
1015 ( 1122 (
1016 $w + $self->border * 2, 1123 $w + $self->border * 2,
… …
1019} 1126}
1020 1127
1021sub size_allocate { 1128sub size_allocate {
1022 my ($self, $w, $h) = @_; 1129 my ($self, $w, $h) = @_;
1023 1130
1131 if ($self->{title}) {
1132 $self->{title}{w} = $w;
1133 $self->{title}{h} = $h;
1134 $self->{title}->size_allocate ($w, $h);
1135 }
1136
1137 my $border = $self->border;
1138
1024 $h -= List::Util::max 0, $self->border * 2; 1139 $h -= List::Util::max 0, $border * 2;
1025 $w -= List::Util::max 0, $self->border * 2; 1140 $w -= List::Util::max 0, $border * 2;
1026 1141
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); 1142 $self->child->configure ($border, $border, $w, $h);
1031} 1143}
1032 1144
1033sub button_down { 1145sub button_down {
1034 my ($self, $ev, $x, $y) = @_; 1146 my ($self, $ev, $x, $y) = @_;
1035 1147
… …
1051 my ($ev, $x, $y) = @_; 1163 my ($ev, $x, $y) = @_;
1052 1164
1053 my $dx = $ev->{x} - $ox; 1165 my $dx = $ev->{x} - $ox;
1054 my $dy = $ev->{y} - $oy; 1166 my $dy = $ev->{y} - $oy;
1055 1167
1056 $self->{user_x} = $wx + $dx * $mx;
1057 $self->{user_y} = $wy + $dy * $my;
1058 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1168 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1059 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1169 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1060 $self->move ($self->{user_x}, $self->{user_y}); 1170
1061 $self->check_size; 1171 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1172 $self->realloc;
1062 }; 1173 };
1063 1174
1064 } elsif ($lr ^ $td) { 1175 } elsif ($lr ^ $td) {
1065 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1176 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1066 my ($bx, $by) = ($self->{x}, $self->{y}); 1177 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1068 $self->{motion} = sub { 1179 $self->{motion} = sub {
1069 my ($ev, $x, $y) = @_; 1180 my ($ev, $x, $y) = @_;
1070 1181
1071 ($x, $y) = ($ev->{x}, $ev->{y}); 1182 ($x, $y) = ($ev->{x}, $ev->{y});
1072 1183
1073 $self->{user_x} = $bx + $x - $ox; 1184 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1074 $self->{user_y} = $by + $y - $oy; 1185 # HACK: the next line is required to enforce placement
1075 $self->move ($self->{user_x}, $self->{user_y}); 1186 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1076 $self->update;
1077 }; 1187 };
1188 } else {
1189 return 0;
1190 }
1191
1078 } 1192 1
1079} 1193}
1080 1194
1081sub button_up { 1195sub button_up {
1082 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
1083 1197
1084 delete $self->{motion}; 1198 !!delete $self->{motion}
1085} 1199}
1086 1200
1087sub mouse_motion { 1201sub mouse_motion {
1088 my ($self, $ev, $x, $y) = @_; 1202 my ($self, $ev, $x, $y) = @_;
1089 1203
1090 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1204 $self->{motion}->($ev, $x, $y) if $self->{motion};
1205
1206 !!$self->{motion}
1091} 1207}
1092 1208
1093sub _draw { 1209sub _draw {
1094 my ($self) = @_; 1210 my ($self) = @_;
1095 1211
1212 my $child = $self->{children}[0];
1213
1096 my ($w, $h ) = ($self->{w}, $self->{h}); 1214 my ($w, $h ) = ($self->{w}, $self->{h});
1097 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1215 my ($cw, $ch) = ($child->{w}, $child->{h});
1098 1216
1099 glEnable GL_TEXTURE_2D; 1217 glEnable GL_TEXTURE_2D;
1100 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1218 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1101 1219
1102 my $border = $self->border; 1220 my $border = $self->border;
1103 1221
1104 glColor @{ $self->{border_bg} }; 1222 glColor @{ $self->{border_bg} };
1105 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1223 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1106 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1224 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1107 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1225 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1108 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1226 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1109 1227
1110 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1228 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1111 my $bg = $tex[0]; 1229 glColor @{ $self->{bg} };
1112 1230
1113 # TODO: repeat texture not scale 1231 # TODO: repeat texture not scale
1232 # solve this better(?)
1114 my $rep_x = $cw / $bg->{w}; 1233 $bg->{s} = $cw / $bg->{w};
1115 my $rep_y = $ch / $bg->{h}; 1234 $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); 1235 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1123 } 1236 }
1124 1237
1125 glDisable GL_TEXTURE_2D; 1238 glDisable GL_TEXTURE_2D;
1126 1239
1127 $self->{title}->draw if $self->{title};
1128
1129 $self->child->draw; 1240 $child->draw;
1241
1242 if ($self->{title}) {
1243 glTranslate 0, $border - $self->{h};
1244 $self->{title}->_draw;
1245 }
1130} 1246}
1131 1247
1132############################################################################# 1248#############################################################################
1133 1249
1134package CFClient::UI::Table; 1250package CFClient::UI::Table;
… …
1156 my ($self, $x, $y, $child) = @_; 1272 my ($self, $x, $y, $child) = @_;
1157 1273
1158 $child->set_parent ($self); 1274 $child->set_parent ($self);
1159 $self->{children}[$y][$x] = $child; 1275 $self->{children}[$y][$x] = $child;
1160 1276
1161 $self->check_size (1); 1277 $self->realloc;
1162} 1278}
1163 1279
1164# TODO: move to container class maybe? send children a signal on removal? 1280# TODO: move to container class maybe? send children a signal on removal?
1165sub clear { 1281sub clear {
1166 my ($self) = @_; 1282 my ($self) = @_;
… …
1171 for (@children) { 1287 for (@children) {
1172 delete $_->{parent}; 1288 delete $_->{parent};
1173 $_->hide; 1289 $_->hide;
1174 } 1290 }
1175 1291
1176 $self->check_size (1); 1292 $self->realloc;
1177 $self->update;
1178} 1293}
1179 1294
1180sub get_wh { 1295sub get_wh {
1181 my ($self) = @_; 1296 my ($self) = @_;
1182 1297
… …
1278 } 1393 }
1279} 1394}
1280 1395
1281############################################################################# 1396#############################################################################
1282 1397
1283package CFClient::UI::HBox; 1398package CFClient::UI::Box;
1284
1285# TODO: wrap into common Box base class
1286 1399
1287our @ISA = CFClient::UI::Container::; 1400our @ISA = CFClient::UI::Container::;
1288 1401
1289sub size_request { 1402sub size_request {
1290 my ($self) = @_; 1403 my ($self) = @_;
1291 1404
1292 my @alloc = map [$_->size_request], @{$self->{children}}; 1405 $self->{vertical}
1293 1406 ? (
1294 ( 1407 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1295 (List::Util::sum map $_->[0], @alloc), 1408 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1296 (List::Util::max map $_->[1], @alloc), 1409 )
1297 ) 1410 : (
1411 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1412 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1413 )
1298} 1414}
1299 1415
1300sub size_allocate { 1416sub size_allocate {
1301 my ($self, $w, $h) = @_; 1417 my ($self, $w, $h) = @_;
1302 1418
1303 ($h, $w) = ($w, $h); 1419 my $space = $self->{vertical} ? $h : $w;
1304
1305 my $children = $self->{children}; 1420 my $children = $self->{children};
1306 1421
1307 my @h = map $_->{req_w}, @$children; 1422 my @req;
1308 1423
1309 my $req_h = List::Util::sum @h; 1424 if ($self->{homogeneous}) {
1310 1425 @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 { 1426 } else {
1427 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1428 my $req = List::Util::sum @req;
1429
1430 if ($req > $space) {
1431 # ah well, not enough space
1432 $_ *= $space / $req for @req;
1433 } else {
1315 my $exp = List::Util::sum map $_->{expand}, @$children; 1434 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1316 $exp ||= 1;
1317 1435
1436 $space = ($space - $req) / $expand; # remaining space to give away
1437
1438 $req[$_] += $space * $children->[$_]{expand}
1318 for (0 .. $#$children) { 1439 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 } 1440 }
1325 } 1441 }
1326 1442
1327 CFClient::UI::harmonize \@h; 1443 CFClient::UI::harmonize \@req;
1328 1444
1329 my $y = 0; 1445 my $pos = 0;
1330 for (0 .. $#$children) { 1446 for (0 .. $#$children) {
1331 my $child = $children->[$_];
1332 my $h = $h[$_]; 1447 my $alloc = $req[$_];
1333 $child->configure ($y, 0, $h, $w); 1448 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1334 1449
1335 $y += $h; 1450 $pos += $alloc;
1336 } 1451 }
1337 1452
1338 1 1453 1
1339} 1454}
1340 1455
1341############################################################################# 1456#############################################################################
1342 1457
1458package CFClient::UI::HBox;
1459
1460our @ISA = CFClient::UI::Box::;
1461
1462sub new {
1463 my $class = shift;
1464
1465 $class->SUPER::new (
1466 vertical => 0,
1467 @_,
1468 )
1469}
1470
1471#############################################################################
1472
1343package CFClient::UI::VBox; 1473package CFClient::UI::VBox;
1344 1474
1345# TODO: wrap into common Box base class
1346
1347our @ISA = CFClient::UI::Container::; 1475our @ISA = CFClient::UI::Box::;
1348 1476
1349sub size_request { 1477sub new {
1350 my ($self) = @_; 1478 my $class = shift;
1351 1479
1352 my @alloc = map [$_->size_request], @{$self->{children}}; 1480 $class->SUPER::new (
1353 1481 vertical => 1,
1354 ( 1482 @_,
1355 (List::Util::max map $_->[0], @alloc),
1356 (List::Util::sum map $_->[1], @alloc),
1357 ) 1483 )
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} 1484}
1398 1485
1399############################################################################# 1486#############################################################################
1400 1487
1401package CFClient::UI::Label; 1488package CFClient::UI::Label;
… …
1418 ellipsise => 3, # end 1505 ellipsise => 3, # end
1419 layout => (new CFClient::Layout), 1506 layout => (new CFClient::Layout),
1420 fontsize => 1, 1507 fontsize => 1,
1421 align => -1, 1508 align => -1,
1422 valign => -1, 1509 valign => -1,
1423 padding => 2, 1510 padding_x => 2,
1511 padding_y => 2,
1424 can_events => 0, 1512 can_events => 0,
1425 %arg 1513 %arg
1426 ); 1514 );
1427 1515
1428 if (exists $self->{template}) { 1516 if (exists $self->{template}) {
… …
1455 1543
1456 delete $self->{texture}; 1544 delete $self->{texture};
1457 $self->SUPER::update; 1545 $self->SUPER::update;
1458} 1546}
1459 1547
1548sub realloc {
1549 my ($self) = @_;
1550
1551 delete $self->{ox};
1552 $self->SUPER::realloc;
1553}
1554
1460sub set_text { 1555sub set_text {
1461 my ($self, $text) = @_; 1556 my ($self, $text) = @_;
1462 1557
1463 return if $self->{text} eq "T$text"; 1558 return if $self->{text} eq "T$text";
1464 $self->{text} = "T$text"; 1559 $self->{text} = "T$text";
1465 1560
1466 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1561 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1467 $self->{layout}->set_text ($text); 1562 $self->{layout}->set_text ($text);
1468 1563
1564 delete $self->{req_h};
1565 $self->realloc;
1469 $self->update; 1566 $self->update;
1470 $self->check_size;
1471} 1567}
1472 1568
1473sub set_markup { 1569sub set_markup {
1474 my ($self, $markup) = @_; 1570 my ($self, $markup) = @_;
1475 1571
… …
1479 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1575 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1480 1576
1481 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1577 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1482 $self->{layout}->set_markup ($markup); 1578 $self->{layout}->set_markup ($markup);
1483 1579
1580 delete $self->{req_h};
1581 $self->realloc;
1484 $self->update; 1582 $self->update;
1485 $self->check_size;
1486} 1583}
1487 1584
1488sub size_request { 1585sub size_request {
1489 my ($self) = @_; 1586 my ($self) = @_;
1490 1587
1588 if (exists $self->{req_h}) {
1589 @$self{qw(req_w req_h)}
1590 } else {
1491 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1591 $self->{layout}->set_font ($self->{font}) if $self->{font};
1492 $self->{layout}->set_width ($self->{max_w} || -1); 1592 $self->{layout}->set_width ($self->{max_w} || -1);
1493 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1593 $self->{layout}->set_ellipsise ($self->{ellipsise});
1494 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1594 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1495 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1595 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1496 1596
1497 my ($w, $h) = $self->{layout}->size; 1597 my ($w, $h) = $self->{layout}->size;
1498 1598
1499 if (exists $self->{template}) { 1599 if (exists $self->{template}) {
1500 $self->{template}->set_font ($self->{font}) if $self->{font}; 1600 $self->{template}->set_font ($self->{font}) if $self->{font};
1501 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1601 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1502 1602
1503 my ($w2, $h2) = $self->{template}->size; 1603 my ($w2, $h2) = $self->{template}->size;
1504 1604
1505 $w = List::Util::max $w, $w2; 1605 $w = List::Util::max $w, $w2;
1506 $h = List::Util::max $h, $h2; 1606 $h = List::Util::max $h, $h2;
1507 } 1607 }
1508 1608
1609 ($w, $h)
1509 ( 1610 }
1510 $w + $self->{padding} * 2,
1511 $h + $self->{padding} * 2,
1512 )
1513} 1611}
1514 1612
1515sub size_allocate { 1613sub size_allocate {
1516 my ($self, $w, $h) = @_; 1614 my ($self, $w, $h) = @_;
1517 1615
1616 delete $self->{ox};
1617
1518 delete $self->{texture}; 1618 delete $self->{texture}
1619 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1519} 1620}
1520 1621
1521sub set_fontsize { 1622sub set_fontsize {
1522 my ($self, $fontsize) = @_; 1623 my ($self, $fontsize) = @_;
1523 1624
1524 $self->{fontsize} = $fontsize; 1625 $self->{fontsize} = $fontsize;
1525 delete $self->{texture}; 1626 delete $self->{texture};
1526 1627
1527 $self->update; 1628 $self->realloc;
1528 $self->check_size;
1529} 1629}
1530 1630
1531sub _draw { 1631sub _draw {
1532 my ($self) = @_; 1632 my ($self) = @_;
1533 1633
… …
1539 $self->{layout}->set_width ($self->{w}); 1639 $self->{layout}->set_width ($self->{w});
1540 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1640 $self->{layout}->set_ellipsise ($self->{ellipsise});
1541 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1641 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1542 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1642 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1543 1643
1544 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1644 new_from_layout CFClient::Texture $self->{layout}
1645 };
1545 1646
1647 unless (exists $self->{ox}) {
1546 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1648 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1547 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1649 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1548 : ($self->{w} - $tex->{w}) * 0.5); 1650 : ($self->{w} - $tex->{w}) * 0.5);
1549 1651
1550 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1652 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1551 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1653 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1552 : ($self->{h} - $tex->{h}) * 0.5); 1654 : ($self->{h} - $tex->{h}) * 0.5);
1553
1554 $tex
1555 }; 1655 };
1556 1656
1557 glEnable GL_TEXTURE_2D; 1657 glEnable GL_TEXTURE_2D;
1558 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1559 1658
1560 if ($tex->{format} == GL_ALPHA) { 1659 if ($tex->{format} == GL_ALPHA) {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1561 glColor @{$self->{fg}}; 1661 glColor @{$self->{fg}};
1562 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1662 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1563 } else { 1663 } else {
1664 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1564 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1665 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1565 } 1666 }
1566 1667
1567 glDisable GL_TEXTURE_2D; 1668 glDisable GL_TEXTURE_2D;
1568} 1669}
… …
1597 1698
1598 delete $self->{cur_h}; 1699 delete $self->{cur_h};
1599 1700
1600 return if $self->{text} eq $text; 1701 return if $self->{text} eq $text;
1601 1702
1602 delete $self->{texture};
1603
1604 $self->{last_activity} = $::NOW; 1703 $self->{last_activity} = $::NOW;
1605 $self->{text} = $text; 1704 $self->{text} = $text;
1606 1705
1607 $text =~ s/./*/g if $self->{hidden}; 1706 $text =~ s/./*/g if $self->{hidden};
1608 $self->{layout}->set_text ("$text "); 1707 $self->{layout}->set_text ("$text ");
1708 delete $self->{req_h};
1609 1709
1610 $self->_emit (changed => $self->{text}); 1710 $self->_emit (changed => $self->{text});
1711
1712 $self->realloc;
1713 $self->update;
1611} 1714}
1612 1715
1613sub set_text { 1716sub set_text {
1614 my ($self, $text) = @_; 1717 my ($self, $text) = @_;
1615 1718
1616 $self->{cursor} = length $text; 1719 $self->{cursor} = length $text;
1617 $self->_set_text ($text); 1720 $self->_set_text ($text);
1618 $self->update;
1619 $self->check_size;
1620} 1721}
1621 1722
1622sub get_text { 1723sub get_text {
1623 $_[0]{text} 1724 $_[0]{text}
1624} 1725}
… …
1654 $self->{cursor} = length $text; 1755 $self->{cursor} = length $text;
1655 } elsif ($uni == 27) { 1756 } elsif ($uni == 27) {
1656 $self->_emit ('escape'); 1757 $self->_emit ('escape');
1657 } elsif ($uni) { 1758 } elsif ($uni) {
1658 substr $text, $self->{cursor}++, 0, chr $uni; 1759 substr $text, $self->{cursor}++, 0, chr $uni;
1760 } else {
1761 return 0;
1659 } 1762 }
1660 1763
1661 $self->_set_text ($text); 1764 $self->_set_text ($text);
1662 $self->update; 1765
1663 $self->check_size; 1766 $self->realloc;
1767
1768 1
1664} 1769}
1665 1770
1666sub focus_in { 1771sub focus_in {
1667 my ($self) = @_; 1772 my ($self) = @_;
1668 1773
… …
1683 utf8::encode $text; 1788 utf8::encode $text;
1684 $self->{cursor} = length substr $text, 0, $idx; 1789 $self->{cursor} = length substr $text, 0, $idx;
1685 1790
1686 $self->_set_text ($self->{text}); 1791 $self->_set_text ($self->{text});
1687 $self->update; 1792 $self->update;
1793
1794 1
1688} 1795}
1689 1796
1690sub mouse_motion { 1797sub mouse_motion {
1691 my ($self, $ev, $x, $y) = @_; 1798 my ($self, $ev, $x, $y) = @_;
1692# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1799# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1800
1801 0
1693} 1802}
1694 1803
1695sub _draw { 1804sub _draw {
1696 my ($self) = @_; 1805 my ($self) = @_;
1697 1806
1698 local $self->{fg} = $self->{fg}; 1807 local $self->{fg} = $self->{fg};
1699 1808
1700 if ($FOCUS == $self) { 1809 if ($FOCUS == $self) {
1701 glColor @{$self->{active_bg}}; 1810 glColor_premultiply @{$self->{active_bg}};
1702 $self->{fg} = $self->{active_fg}; 1811 $self->{fg} = $self->{active_fg};
1703 } else { 1812 } else {
1704 glColor @{$self->{bg}}; 1813 glColor_premultiply @{$self->{bg}};
1705 } 1814 }
1706 1815
1707 glEnable GL_BLEND; 1816 glEnable GL_BLEND;
1708 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1817 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1709 glBegin GL_QUADS; 1818 glBegin GL_QUADS;
1710 glVertex 0 , 0; 1819 glVertex 0 , 0;
1711 glVertex 0 , $self->{h}; 1820 glVertex 0 , $self->{h};
1712 glVertex $self->{w}, $self->{h}; 1821 glVertex $self->{w}, $self->{h};
1713 glVertex $self->{w}, 0; 1822 glVertex $self->{w}, 0;
… …
1774 } else { 1883 } else {
1775 $self->set_text ($self->{history_saveback}); 1884 $self->set_text ($self->{history_saveback});
1776 } 1885 }
1777 1886
1778 } else { 1887 } else {
1779 $self->SUPER::key_down ($ev); 1888 return $self->SUPER::key_down ($ev)
1889 }
1890
1780 } 1891 1
1781
1782} 1892}
1783 1893
1784############################################################################# 1894#############################################################################
1785 1895
1786package CFClient::UI::Button; 1896package CFClient::UI::Button;
… …
1795 1905
1796sub new { 1906sub new {
1797 my $class = shift; 1907 my $class = shift;
1798 1908
1799 $class->SUPER::new ( 1909 $class->SUPER::new (
1800 padding => 4, 1910 padding_x => 4,
1911 padding_y => 4,
1801 fg => [1, 1, 1], 1912 fg => [1, 1, 1],
1802 active_fg => [0, 0, 1], 1913 active_fg => [0, 0, 1],
1803 can_hover => 1, 1914 can_hover => 1,
1804 align => 0, 1915 align => 0,
1805 valign => 0, 1916 valign => 0,
… …
1814 my ($self, $ev, $x, $y) = @_; 1925 my ($self, $ev, $x, $y) = @_;
1815 1926
1816 $self->emit ("activate") 1927 $self->emit ("activate")
1817 if $x >= 0 && $x < $self->{w} 1928 if $x >= 0 && $x < $self->{w}
1818 && $y >= 0 && $y < $self->{h}; 1929 && $y >= 0 && $y < $self->{h};
1930
1931 1
1819} 1932}
1820 1933
1821sub _draw { 1934sub _draw {
1822 my ($self) = @_; 1935 my ($self) = @_;
1823 1936
1824 local $self->{fg} = $self->{fg}; 1937 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1825
1826 if ($GRAB == $self) {
1827 $self->{fg} = $self->{active_fg};
1828 }
1829 1938
1830 glEnable GL_TEXTURE_2D; 1939 glEnable GL_TEXTURE_2D;
1831 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1940 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1832 glColor 0, 0, 0, 1; 1941 glColor 0, 0, 0, 1;
1833 1942
… …
1852 1961
1853sub new { 1962sub new {
1854 my $class = shift; 1963 my $class = shift;
1855 1964
1856 $class->SUPER::new ( 1965 $class->SUPER::new (
1857 padding => 2, 1966 padding_x => 2,
1967 padding_y => 2,
1858 fg => [1, 1, 1], 1968 fg => [1, 1, 1],
1859 active_fg => [1, 1, 0], 1969 active_fg => [1, 1, 0],
1860 bg => [0, 0, 0, 0.2], 1970 bg => [0, 0, 0, 0.2],
1861 active_bg => [1, 1, 1, 0.5], 1971 active_bg => [1, 1, 1, 0.5],
1862 state => 0, 1972 state => 0,
… …
1866} 1976}
1867 1977
1868sub size_request { 1978sub size_request {
1869 my ($self) = @_; 1979 my ($self) = @_;
1870 1980
1871 ($self->{padding} * 2 + 6) x 2 1981 (6) x 2
1872} 1982}
1873 1983
1874sub button_down { 1984sub button_down {
1875 my ($self, $ev, $x, $y) = @_; 1985 my ($self, $ev, $x, $y) = @_;
1876 1986
1877 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1987 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1878 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1988 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1879 $self->{state} = !$self->{state}; 1989 $self->{state} = !$self->{state};
1880 $self->_emit (changed => $self->{state}); 1990 $self->_emit (changed => $self->{state});
1991 } else {
1992 return 0
1993 }
1994
1881 } 1995 1
1882} 1996}
1883 1997
1884sub _draw { 1998sub _draw {
1885 my ($self) = @_; 1999 my ($self) = @_;
1886 2000
1887 $self->SUPER::_draw; 2001 $self->SUPER::_draw;
1888 2002
1889 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2003 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1890 2004
1891 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2005 my ($w, $h) = @$self{qw(w h)};
2006
2007 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1892 2008
1893 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2009 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1894 2010
1895 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2011 my $tex = $self->{state} ? $tex[1] : $tex[0];
1896 2012
… …
2051 2167
2052 my $h1 = $self->{h} * (1 - $ycut1); 2168 my $h1 = $self->{h} * (1 - $ycut1);
2053 my $h2 = $self->{h} * (1 - $ycut2); 2169 my $h2 = $self->{h} * (1 - $ycut2);
2054 2170
2055 glEnable GL_BLEND; 2171 glEnable GL_BLEND;
2056 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2172 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2173 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2057 glEnable GL_TEXTURE_2D; 2174 glEnable GL_TEXTURE_2D;
2058 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2175 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2059 2176
2060 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2177 glBindTexture GL_TEXTURE_2D, $t1->{name};
2061 glBegin GL_QUADS; 2178 glBegin GL_QUADS;
… …
2161 fg => [1, 1, 1], 2278 fg => [1, 1, 1],
2162 active_fg => [0, 0, 0], 2279 active_fg => [0, 0, 0],
2163 bg => [0, 0, 0, 0.2], 2280 bg => [0, 0, 0, 0.2],
2164 active_bg => [1, 1, 1, 0.5], 2281 active_bg => [1, 1, 1, 0.5],
2165 range => [0, 0, 100, 10, 0], 2282 range => [0, 0, 100, 10, 0],
2166 req_w => $::WIDTH / 80, 2283 min_w => $::WIDTH / 80,
2167 req_h => $::WIDTH / 80, 2284 min_h => $::WIDTH / 80,
2168 vertical => 0, 2285 vertical => 0,
2169 can_hover => 1, 2286 can_hover => 1,
2170 inner_pad => 0.02, 2287 inner_pad => 0.02,
2171 @_ 2288 @_
2172 ); 2289 );
… …
2175 $self->update; 2292 $self->update;
2176 2293
2177 $self 2294 $self
2178} 2295}
2179 2296
2297sub changed { }
2298
2180sub set_range { 2299sub set_range {
2181 my ($self, $range) = @_; 2300 my ($self, $range) = @_;
2182 2301
2183 ($range, $self->{range}) = ($self->{range}, $range); 2302 ($range, $self->{range}) = ($self->{range}, $range);
2184 2303
… …
2210} 2329}
2211 2330
2212sub size_request { 2331sub size_request {
2213 my ($self) = @_; 2332 my ($self) = @_;
2214 2333
2215 my $w = $self->{req_w}; 2334 ($self->{req_w}, $self->{req_h})
2216 my $h = $self->{req_h};
2217
2218 $self->{vertical} ? ($h, $w) : ($w, $h)
2219} 2335}
2220 2336
2221sub button_down { 2337sub button_down {
2222 my ($self, $ev, $x, $y) = @_; 2338 my ($self, $ev, $x, $y) = @_;
2223 2339
2224 $self->SUPER::button_down ($ev, $x, $y); 2340 $self->SUPER::button_down ($ev, $x, $y);
2225 2341
2226 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2342 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2227 2343
2228 $self->mouse_motion ($ev, $x, $y); 2344 $self->mouse_motion ($ev, $x, $y)
2229} 2345}
2230 2346
2231sub mouse_motion { 2347sub mouse_motion {
2232 my ($self, $ev, $x, $y) = @_; 2348 my ($self, $ev, $x, $y) = @_;
2233 2349
… …
2237 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2353 my (undef, $lo, $hi, $page) = @{$self->{range}};
2238 2354
2239 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2355 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2240 2356
2241 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2357 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2358 } else {
2359 return 0;
2360 }
2361
2242 } 2362 1
2243} 2363}
2244 2364
2245sub update { 2365sub update {
2246 my ($self) = @_; 2366 my ($self) = @_;
2247 2367
2248 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2368 delete $self->{knob_w};
2369 $self->SUPER::update;
2370}
2371
2372sub _draw {
2373 my ($self) = @_;
2374
2375 unless ($self->{knob_w}) {
2249 $self->set_value ($self->{range}[0]); 2376 $self->set_value ($self->{range}[0]);
2250 2377
2251 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2378 my ($value, $lo, $hi, $page) = @{$self->{range}};
2252 my $range = ($hi - $page - $lo) || 1e-100; 2379 my $range = ($hi - $page - $lo) || 1e-100;
2253 2380
… …
2259 $value = ($value - $lo) / $range; 2386 $value = ($value - $lo) / $range;
2260 $value = $value * $self->{scale} + $self->{offset}; 2387 $value = $value * $self->{scale} + $self->{offset};
2261 2388
2262 $self->{knob_x} = $value - $knob_w * 0.5; 2389 $self->{knob_x} = $value - $knob_w * 0.5;
2263 $self->{knob_w} = $knob_w; 2390 $self->{knob_w} = $knob_w;
2264 }); 2391 }
2265
2266 $self->SUPER::update;
2267}
2268
2269sub _draw {
2270 my ($self) = @_;
2271 2392
2272 $self->SUPER::_draw (); 2393 $self->SUPER::_draw ();
2273 2394
2274 glScale $self->{w}, $self->{h}; 2395 glScale $self->{w}, $self->{h};
2275 2396
… …
2469 2590
2470 delete $self->{texture}; 2591 delete $self->{texture};
2471 } 2592 }
2472 2593
2473 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2594 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2474 glClearColor 0.5, 0.5, 0.5, 0; 2595 glClearColor 0, 0, 0, 0;
2475 glClear GL_COLOR_BUFFER_BIT; 2596 glClear GL_COLOR_BUFFER_BIT;
2476 2597
2477 my $top = int $self->{children}[1]{range}[0]; 2598 my $top = int $self->{children}[1]{range}[0];
2478 2599
2479 my $y0 = $top; 2600 my $y0 = $top;
… …
2514sub _draw { 2635sub _draw {
2515 my ($self) = @_; 2636 my ($self) = @_;
2516 2637
2517 glEnable GL_TEXTURE_2D; 2638 glEnable GL_TEXTURE_2D;
2518 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2519 glColor 1, 1, 1, 1; 2640 glColor 0, 0, 0, 1;
2520 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2641 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2521 glDisable GL_TEXTURE_2D; 2642 glDisable GL_TEXTURE_2D;
2522 2643
2523 $self->{children}[1]->draw; 2644 $self->{children}[1]->draw;
2524 2645
2525} 2646}
… …
2579 state => 0, 2700 state => 0,
2580 on_activate => \&toggle_flopper, 2701 on_activate => \&toggle_flopper,
2581 @_ 2702 @_
2582 ); 2703 );
2583 2704
2584 if ($self->{state}) {
2585 $self->{state} = 0;
2586 $self->toggle_flopper;
2587 }
2588
2589 $self 2705 $self
2590} 2706}
2591 2707
2592sub toggle_flopper { 2708sub toggle_flopper {
2593 my ($self) = @_; 2709 my ($self) = @_;
2594 2710
2595 # TODO: use animation 2711 $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} 2712}
2607 2713
2608############################################################################# 2714#############################################################################
2609 2715
2610package CFClient::UI::Tooltip; 2716package CFClient::UI::Tooltip;
… …
2623} 2729}
2624 2730
2625sub set_tooltip_from { 2731sub set_tooltip_from {
2626 my ($self, $widget) = @_; 2732 my ($self, $widget) = @_;
2627 2733
2734 my $tooltip = $widget->{tooltip};
2735
2736 if ($ENV{CFPLUS_DEBUG} & 2) {
2737 $tooltip .= "\n\n" . (ref $widget) . "\n"
2738 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2739 . "req $widget->{req_w} $widget->{req_h}\n"
2740 . "visible $widget->{visible}";
2741 }
2742
2628 $self->add (new CFClient::UI::Label 2743 $self->add (new CFClient::UI::Label
2629 markup => $widget->{tooltip}, 2744 markup => $tooltip,
2630 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2745 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2631 fontsize => 0.8, 2746 fontsize => 0.8,
2632 fg => [0, 0, 0, 1], 2747 fg => [0, 0, 0, 1],
2633 ellipsise => 0, 2748 ellipsise => 0,
2634 font => ($widget->{tooltip_font} || $::FONT_PROP), 2749 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2645 2760
2646sub size_allocate { 2761sub size_allocate {
2647 my ($self, $w, $h) = @_; 2762 my ($self, $w, $h) = @_;
2648 2763
2649 $self->SUPER::size_allocate ($w - 4, $h - 4); 2764 $self->SUPER::size_allocate ($w - 4, $h - 4);
2765}
2766
2767sub visibility_change {
2768 my ($self, $visible) = @_;
2769
2770 return unless $visible;
2771
2772 $self->{root}->on_post_alloc ("move_$self" => sub {
2773 my $widget = $self->{owner}
2774 or return;
2775
2776 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2777
2778 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2779 if $x + $self->{w} > $::WIDTH;
2780
2781 $self->move_abs ($x, $y);
2782 });
2650} 2783}
2651 2784
2652sub _draw { 2785sub _draw {
2653 my ($self) = @_; 2786 my ($self) = @_;
2654 2787
… …
2671 glVertex $w, $h; 2804 glVertex $w, $h;
2672 glVertex $w, 0; 2805 glVertex $w, 0;
2673 glEnd; 2806 glEnd;
2674 2807
2675 glTranslate 2 - 0.375, 2 - 0.375; 2808 glTranslate 2 - 0.375, 2 - 0.375;
2809
2676 $self->SUPER::_draw; 2810 $self->SUPER::_draw;
2677} 2811}
2678 2812
2679############################################################################# 2813#############################################################################
2680 2814
… …
2739 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2873 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2740 2874
2741 if ($tex) { 2875 if ($tex) {
2742 glEnable GL_TEXTURE_2D; 2876 glEnable GL_TEXTURE_2D;
2743 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2877 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2744 glColor 1, 1, 1, 1; 2878 glColor 0, 0, 0, 1;
2745 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2879 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2746 glDisable GL_TEXTURE_2D; 2880 glDisable GL_TEXTURE_2D;
2747 } 2881 }
2748} 2882}
2749 2883
… …
2756 $self->SUPER::DESTROY; 2890 $self->SUPER::DESTROY;
2757} 2891}
2758 2892
2759############################################################################# 2893#############################################################################
2760 2894
2761package CFClient::UI::Inventory; 2895package CFClient::UI::Buttonbar;
2762 2896
2763our @ISA = CFClient::UI::ScrolledWindow::; 2897our @ISA = CFClient::UI::HBox::;
2764 2898
2765sub new { 2899# 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 2900
2806############################################################################# 2901#############################################################################
2807 2902
2808package CFClient::UI::Menu; 2903package CFClient::UI::Menu;
2809 2904
… …
2850 # maybe save $GRAB? must be careful about events... 2945 # maybe save $GRAB? must be careful about events...
2851 $GRAB = $self; 2946 $GRAB = $self;
2852 $self->{button} = $ev->{button}; 2947 $self->{button} = $ev->{button};
2853 2948
2854 $self->show; 2949 $self->show;
2855 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2950 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2856} 2951}
2857 2952
2858sub mouse_motion { 2953sub mouse_motion {
2859 my ($self, $ev, $x, $y) = @_; 2954 my ($self, $ev, $x, $y) = @_;
2860 2955
2861 # TODO: should use vbox->find_widget or so 2956 # TODO: should use vbox->find_widget or so
2862 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2957 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2863 $self->{hover} = $self->{item}{$HOVER}; 2958 $self->{hover} = $self->{item}{$HOVER};
2959
2960 0
2864} 2961}
2865 2962
2866sub button_up { 2963sub button_up {
2867 my ($self, $ev, $x, $y) = @_; 2964 my ($self, $ev, $x, $y) = @_;
2868 2965
… …
2870 undef $GRAB; 2967 undef $GRAB;
2871 $self->hide; 2968 $self->hide;
2872 2969
2873 $self->_emit ("popdown"); 2970 $self->_emit ("popdown");
2874 $self->{hover}[1]->() if $self->{hover}; 2971 $self->{hover}[1]->() if $self->{hover};
2972 } else {
2973 return 0
2974 }
2975
2875 } 2976 1
2876} 2977}
2877 2978
2878############################################################################# 2979#############################################################################
2879 2980
2880package CFClient::UI::Statusbox; 2981package CFClient::UI::Multiplexer;
2881 2982
2882our @ISA = CFClient::UI::VBox::; 2983our @ISA = CFClient::UI::Container::;
2883 2984
2884sub new { 2985sub new {
2885 my $class = shift; 2986 my $class = shift;
2886 2987
2887 $class->SUPER::new ( 2988 my $self = $class->SUPER::new (
2989 @_,
2990 );
2991
2992 $self->{current} = $self->{children}[0]
2993 if @{ $self->{children} };
2994
2995 $self
2996}
2997
2998sub add {
2999 my ($self, @widgets) = @_;
3000
3001 $self->SUPER::add (@widgets);
3002
3003 $self->{current} = $self->{children}[0]
3004 if @{ $self->{children} };
3005}
3006
3007sub set_current_page {
3008 my ($self, $page_or_widget) = @_;
3009
3010 my $widget = ref $page_or_widget
3011 ? $page_or_widget
3012 : $self->{children}[$page_or_widget];
3013
3014 $self->{current} = $widget;
3015 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3016
3017 $self->_emit (page_changed => $self->{current});
3018
3019 $self->realloc;
3020}
3021
3022sub visible_children {
3023 $_[0]{current}
3024}
3025
3026sub size_request {
3027 my ($self) = @_;
3028
3029 $self->{current}->size_request
3030}
3031
3032sub size_allocate {
3033 my ($self, $w, $h) = @_;
3034
3035 $self->{current}->configure (0, 0, $w, $h);
3036}
3037
3038sub _draw {
3039 my ($self) = @_;
3040
3041 $self->{current}->draw;
3042}
3043
3044#############################################################################
3045
3046package CFClient::UI::Notebook;
3047
3048our @ISA = CFClient::UI::VBox::;
3049
3050sub new {
3051 my $class = shift;
3052
3053 my $self = $class->SUPER::new (
3054 buttonbar => (new CFClient::UI::Buttonbar),
3055 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3056 # filter => # will be put between multiplexer and $self
3057 @_,
3058 );
3059
3060 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3061 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3062
3063 $self
3064}
3065
3066sub add {
3067 my ($self, $title, $widget, $tooltip) = @_;
3068
3069 Scalar::Util::weaken $self;
3070
3071 $self->{buttonbar}->add (new CFClient::UI::Button
3072 markup => $title,
3073 tooltip => $tooltip,
3074 on_activate => sub { $self->set_current_page ($widget) },
3075 );
3076
3077 $self->{multiplexer}->add ($widget);
3078}
3079
3080sub set_current_page {
3081 my ($self, $page) = @_;
3082
3083 $self->{multiplexer}->set_current_page ($page);
3084 $self->_emit (page_changed => $self->{multiplexer}{current});
3085}
3086
3087#############################################################################
3088
3089package CFClient::UI::Statusbox;
3090
3091our @ISA = CFClient::UI::VBox::;
3092
3093sub new {
3094 my $class = shift;
3095
3096 my $self = $class->SUPER::new (
2888 fontsize => 0.8, 3097 fontsize => 0.8,
2889 @_, 3098 @_,
2890 ) 3099 );
3100
3101 Scalar::Util::weaken (my $this = $self);
3102
3103 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3104
3105 $self
2891} 3106}
2892 3107
2893sub reorder { 3108sub reorder {
2894 my ($self) = @_; 3109 my ($self) = @_;
2895 my $NOW = time; 3110 my $NOW = Time::HiRes::time;
3111
3112 # freeze display when hovering over any label
3113 return if $CFClient::UI::TOOLTIP->{owner}
3114 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3115 values %{ $self->{item} };
2896 3116
2897 while (my ($k, $v) = each %{ $self->{item} }) { 3117 while (my ($k, $v) = each %{ $self->{item} }) {
2898 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3118 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2899 } 3119 }
2900 3120
… …
2903 my @items = sort { 3123 my @items = sort {
2904 $a->{pri} <=> $b->{pri} 3124 $a->{pri} <=> $b->{pri}
2905 or $b->{id} <=> $a->{id} 3125 or $b->{id} <=> $a->{id}
2906 } values %{ $self->{item} }; 3126 } values %{ $self->{item} };
2907 3127
3128 $self->{timer}->interval (1);
3129
2908 my $count = 10 + 1; 3130 my $count = 10 + 1;
2909 for my $item (@items) { 3131 for my $item (@items) {
2910 last unless --$count; 3132 last unless --$count;
2911 3133
2912 push @widgets, $item->{label} ||= do { 3134 my $label = $item->{label} ||= do {
2913 # TODO: doesn't handle markup well (read as: at all) 3135 # TODO: doesn't handle markup well (read as: at all)
2914 my $short = $item->{count} > 1 3136 my $short = $item->{count} > 1
2915 ? "<b>$item->{count} ×</b> $item->{text}" 3137 ? "<b>$item->{count} ×</b> $item->{text}"
2916 : $item->{text}; 3138 : $item->{text};
2917 3139
… …
2925 tooltip => $item->{tooltip}, 3147 tooltip => $item->{tooltip},
2926 tooltip_font => $::FONT_PROP, 3148 tooltip_font => $::FONT_PROP,
2927 tooltip_width => 0.67, 3149 tooltip_width => 0.67,
2928 fontsize => $item->{fontsize} || $self->{fontsize}, 3150 fontsize => $item->{fontsize} || $self->{fontsize},
2929 max_w => $::WIDTH * 0.44, 3151 max_w => $::WIDTH * 0.44,
2930 fg => $item->{fg}, 3152 fg => [@{ $item->{fg} }],
2931 can_events => 1, 3153 can_events => 1,
2932 can_hover => 1 3154 can_hover => 1
2933 }; 3155 };
3156
3157 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3158 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3159 $label->update;
3160 $label->set_max_size (undef, $label->{req_h} * $diff)
3161 if $diff < 1;
3162 $self->{timer}->interval (1/30);
3163 } else {
3164 $label->{fg}[3] = $item->{fg}[3] || 1;
3165 }
3166
3167 push @widgets, $label;
2934 } 3168 }
2935 3169
2936 $self->clear; 3170 $self->clear;
2937 $self->SUPER::add (reverse @widgets); 3171 $self->SUPER::add (reverse @widgets);
2938} 3172}
… …
2943 $text =~ s/^\s+//; 3177 $text =~ s/^\s+//;
2944 $text =~ s/\s+$//; 3178 $text =~ s/\s+$//;
2945 3179
2946 return unless $text; 3180 return unless $text;
2947 3181
2948 my $timeout = time + ((delete $arg{timeout}) || 60); 3182 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2949 3183
2950 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3184 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2951 3185
2952 if (my $item = $self->{item}{$group}) { 3186 if (my $item = $self->{item}{$group}) {
2953 if ($item->{text} eq $text) { 3187 if ($item->{text} eq $text) {
… …
2983 3217
2984 $self->reorder; 3218 $self->reorder;
2985 $self->SUPER::reconfigure; 3219 $self->SUPER::reconfigure;
2986} 3220}
2987 3221
3222sub DESTROY {
3223 my ($self) = @_;
3224
3225 $self->{timer}->cancel;
3226
3227 $self->SUPER::DESTROY;
3228}
3229
2988############################################################################# 3230#############################################################################
2989 3231
2990package CFClient::UI::Root; 3232package CFClient::UI::Inventory;
2991 3233
2992our @ISA = CFClient::UI::Container::; 3234our @ISA = CFClient::UI::ScrolledWindow::;
2993
2994use CFClient::OpenGL;
2995 3235
2996sub new { 3236sub new {
2997 my $class = shift; 3237 my $class = shift;
2998 3238
2999 $class->SUPER::new ( 3239 my $self = $class->SUPER::new (
3240 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3241 @_,
3242 );
3243
3244 $self
3245}
3246
3247sub set_items {
3248 my ($self, $items) = @_;
3249
3250 $self->{child}->clear;
3251 return unless $items;
3252
3253 my @items = sort {
3254 ($a->{type} <=> $b->{type})
3255 or ($a->{name} cmp $b->{name})
3256 } @$items;
3257
3258 $self->{real_items} = \@items;
3259
3260 my $row = 0;
3261 for my $item (@items) {
3262 CFClient::Item::update_widgets $item;
3263
3264 $self->{child}->add (0, $row, $item->{face_widget});
3265 $self->{child}->add (1, $row, $item->{desc_widget});
3266 $self->{child}->add (2, $row, $item->{weight_widget});
3267
3268 $row++;
3269 }
3270}
3271
3272#############################################################################
3273
3274package CFClient::UI::BindEditor;
3275
3276our @ISA = CFClient::UI::FancyFrame::;
3277
3278sub new {
3279 my $class = shift;
3280
3281 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3282
3283 $self->add (my $vb = new CFClient::UI::VBox);
3284
3285
3286 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3287 text => "start recording",
3288 tooltip => "Start/Stops recording of actions."
3289 ."All subsequent actions after the recording started will be captured."
3290 ."The actions are displayed after the record was stopped."
3291 ."To bind the action you have to click on the 'Bind' button",
3292 on_activate => sub {
3293 unless ($self->{recording}) {
3294 $self->start;
3295 } else {
3296 $self->stop;
3297 }
3298 });
3299
3300 $vb->add (new CFClient::UI::Label text => "Actions:");
3301 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3302
3303 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3304 $vb->add (my $hb = new CFClient::UI::HBox);
3305 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3306 $hb->add (new CFClient::UI::Button
3307 text => "bind",
3308 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3309 on_activate => sub {
3310 $self->ask_for_bind;
3311 });
3312
3313 $vb->add (my $hb = new CFClient::UI::HBox);
3314 $hb->add (new CFClient::UI::Button
3315 text => "ok",
3316 expand => 1,
3317 tooltip => "This closes the binding editor and saves the binding",
3318 on_activate => sub {
3319 $self->hide;
3320 $self->commit;
3321 });
3322
3323 $hb->add (new CFClient::UI::Button
3324 text => "cancel",
3325 expand => 1,
3326 tooltip => "This closes the binding editor without saving",
3327 on_activate => sub {
3328 $self->hide;
3329 $self->{binding_cancel}->()
3330 if $self->{binding_cancel};
3331 });
3332
3333 $self->update_binding_widgets;
3334
3335 $self
3336}
3337
3338sub commit {
3339 my ($self) = @_;
3340 my ($mod, $sym, $cmds) = $self->get_binding;
3341 if ($sym != 0 && @$cmds > 0) {
3342 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3343 ."'. Don't forget 'Save Config'!");
3344 $self->{binding_change}->($mod, $sym, $cmds)
3345 if $self->{binding_change};
3346 } else {
3347 $::STATUSBOX->add ("No action bound, no key or action specified!");
3348 $self->{binding_cancel}->()
3349 if $self->{binding_cancel};
3350 }
3351}
3352
3353sub start {
3354 my ($self) = @_;
3355
3356 $self->{rec_btn}->set_text ("stop recording");
3357 $self->{recording} = 1;
3358 $self->clear_command_list;
3359 $::CONN->start_record if $::CONN;
3360}
3361
3362sub stop {
3363 my ($self) = @_;
3364
3365 $self->{rec_btn}->set_text ("start recording");
3366 $self->{recording} = 0;
3367
3368 my $rec;
3369 $rec = $::CONN->stop_record if $::CONN;
3370 return unless ref $rec eq 'ARRAY';
3371 $self->set_command_list ($rec);
3372}
3373
3374
3375sub ask_for_bind_and_commit {
3376 my ($self) = @_;
3377 $self->ask_for_bind (1);
3378}
3379
3380sub ask_for_bind {
3381 my ($self, $commit) = @_;
3382
3383 CFClient::Binder::open_binding_dialog (sub {
3384 my ($mod, $sym) = @_;
3385 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3386 $self->update_binding_widgets;
3387 $self->commit if $commit;
3388 });
3389}
3390
3391# $mod and $sym are the modifiers and key symbol
3392# $cmds is a array ref of strings (the commands)
3393# $cb is the callback that is executed on OK
3394# $ccb is the callback that is executed on CANCEL and
3395# when the binding was unsuccessful on OK
3396sub set_binding {
3397 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3398
3399 $self->clear_command_list;
3400 $self->{recording} = 0;
3401 $self->{rec_btn}->set_text ("start recording");
3402
3403 $self->{binding} = [$mod, $sym];
3404 $self->{commands} = $cmds;
3405
3406 $self->{binding_change} = $cb;
3407 $self->{binding_cancel} = $ccb;
3408
3409 $self->update_binding_widgets;
3410}
3411
3412# this is a shortcut method that asks for a binding
3413# and then just binds it.
3414sub do_quick_binding {
3415 my ($self, $cmds) = @_;
3416 $self->set_binding (undef, undef, $cmds, sub {
3417 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3418 });
3419 $self->ask_for_bind (1);
3420}
3421
3422sub update_binding_widgets {
3423 my ($self) = @_;
3424 my ($mod, $sym, $cmds) = $self->get_binding;
3425 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3426 $self->set_command_list ($cmds);
3427}
3428
3429sub get_binding {
3430 my ($self) = @_;
3431 return (
3432 $self->{binding}->[0],
3433 $self->{binding}->[1],
3434 [ grep { defined $_ } @{$self->{commands}} ]
3435 );
3436}
3437
3438sub clear_command_list {
3439 my ($self) = @_;
3440 $self->{cmdbox}->clear ();
3441}
3442
3443sub set_command_list {
3444 my ($self, $cmds) = @_;
3445
3446 $self->{cmdbox}->clear ();
3447 $self->{commands} = $cmds;
3448
3449 my $idx = 0;
3450
3451 for (@$cmds) {
3452 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3453
3454 my $i = $idx;
3455 $hb->add (new CFClient::UI::Label text => $_);
3456 $hb->add (new CFClient::UI::Button
3457 text => "delete",
3458 tooltip => "Deletes the action from the record",
3459 on_activate => sub {
3460 $self->{cmdbox}->remove ($hb);
3461 $cmds->[$i] = undef;
3462 });
3463
3464
3465 $idx++
3466 }
3467}
3468
3469#############################################################################
3470
3471package CFClient::UI::SpellList;
3472
3473our @ISA = CFClient::UI::Table::;
3474
3475sub new {
3476 my $class = shift;
3477
3478 my $self = $class->SUPER::new (
3479 binding => [],
3480 commands => [],
3481 @_,
3482 )
3483}
3484
3485# XXX: Do sorting? Argl...
3486sub add_spell {
3487 my ($self, $spell) = @_;
3488 $self->{spells}->{$spell->{name}} = $spell;
3489
3490 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3491 face => $spell->{face},
3492 can_hover => 1,
3493 can_events => 1,
3494 tooltip => $spell->{message});
3495
3496 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => $spell->{name},
3498 can_hover => 1,
3499 can_events => 1,
3500 tooltip => $spell->{message},
3501 expand => 1);
3502
3503 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3504 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3505 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3506 expand => 1);
3507
3508 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3509 text => "bind to key",
3510 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3511}
3512
3513sub rebuild_spell_list {
3514 my ($self) = @_;
3515 $self->{tbl_idx} = 0;
3516 $self->add_spell ($_) for values %{$self->{spells}};
3517}
3518
3519sub remove_spell {
3520 my ($self, $spell) = @_;
3521 delete $self->{spells}->{$spell->{name}};
3522 $self->rebuild_spell_list;
3523}
3524
3525#############################################################################
3526
3527package CFClient::UI::Root;
3528
3529our @ISA = CFClient::UI::Container::;
3530
3531use List::Util qw(min max);
3532
3533use CFClient::OpenGL;
3534
3535sub new {
3536 my $class = shift;
3537
3538 my $self = $class->SUPER::new (
3000 visible => 1, 3539 visible => 1,
3001 @_, 3540 @_,
3002 ) 3541 );
3003}
3004 3542
3005sub configure { 3543 Scalar::Util::weaken ($self->{root} = $self);
3006 my ($self, $x, $y, $w, $h) = @_;
3007 3544
3008 $self->{w} = $w; 3545 $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} 3546}
3018 3547
3019sub size_request { 3548sub size_request {
3020 my ($self) = @_; 3549 my ($self) = @_;
3021 3550
3022 ($self->{w}, $self->{h}) 3551 ($self->{w}, $self->{h})
3552}
3553
3554sub _to_pixel {
3555 my ($coord, $size, $max) = @_;
3556
3557 $coord =
3558 $coord eq "center" ? ($max - $size) * 0.5
3559 : $coord eq "max" ? $max
3560 : $coord;
3561
3562 $coord = 0 if $coord < 0;
3563 $coord = $max - $size if $coord > $max - $size;
3564
3565 int $coord + 0.5
3023} 3566}
3024 3567
3025sub size_allocate { 3568sub size_allocate {
3026 my ($self, $w, $h) = @_; 3569 my ($self, $w, $h) = @_;
3027 3570
3028 for my $child ($self->children) { 3571 for my $child ($self->children) {
3029 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3572 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3030 3573
3031 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3574 $X = $child->{force_x} if exists $child->{force_x};
3032 if exists $child->{req_x}; 3575 $Y = $child->{force_y} if exists $child->{force_y};
3033 3576
3034 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3577 $X = _to_pixel $X, $W, $self->{w};
3035 if exists $child->{req_y}; 3578 $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 3579
3040 $child->configure ($X, $Y, $W, $H); 3580 $child->configure ($X, $Y, $W, $H);
3041 } 3581 }
3042} 3582}
3043 3583
… …
3054} 3594}
3055 3595
3056sub update { 3596sub update {
3057 my ($self) = @_; 3597 my ($self) = @_;
3058 3598
3059 $self->check_size;
3060 $::WANT_REFRESH++; 3599 $::WANT_REFRESH++;
3061} 3600}
3062 3601
3063sub add { 3602sub add {
3064 my ($self, @children) = @_; 3603 my ($self, @children) = @_;
3065 3604
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; 3605 $_->{is_toplevel} = 1
3074 3606 for @children;
3075 # integerise window positions
3076 $child->{x} = int $child->{x};
3077 $child->{y} = int $child->{y};
3078 }
3079 3607
3080 $self->SUPER::add (@children); 3608 $self->SUPER::add (@children);
3081} 3609}
3082 3610
3083sub remove { 3611sub remove {
3084 my ($self, @children) = @_; 3612 my ($self, @children) = @_;
3085 3613
3086 $self->SUPER::remove (@children); 3614 $self->SUPER::remove (@children);
3615
3616 delete $self->{is_toplevel}
3617 for @children;
3087 3618
3088 while (@children) { 3619 while (@children) {
3089 my $w = pop @children; 3620 my $w = pop @children;
3090 push @children, $w->children; 3621 push @children, $w->children;
3091 $w->set_invisible; 3622 $w->set_invisible;
… …
3110 while ($self->{refresh_hook}) { 3641 while ($self->{refresh_hook}) {
3111 $_->() 3642 $_->()
3112 for values %{delete $self->{refresh_hook}}; 3643 for values %{delete $self->{refresh_hook}};
3113 } 3644 }
3114 3645
3115 if ($self->{check_size}) { 3646 if ($self->{realloc}) {
3647 my %queue;
3116 my @queue; 3648 my @queue;
3649 my $widget;
3117 3650
3118 for (;;) { 3651 outer:
3119 if ($self->{check_size}) { 3652 while () {
3120 #TODO use array-of-depth approach 3653 if (my $realloc = delete $self->{realloc}) {
3654 for $widget (values %$realloc) {
3655 $widget->{visible} or next; # do not resize invisible widgets
3121 3656
3122 @queue = sort { $a->{visible} <=> $b->{visible} } 3657 $queue{$widget+0}++ and next; # duplicates are common
3123 @queue, values %{delete $self->{check_size}}; 3658
3659 push @{ $queue[$widget->{visible}] }, $widget;
3660 }
3124 } 3661 }
3125 3662
3663 while () {
3664 @queue or last outer;
3665
3126 my $widget = pop @queue || last; 3666 $widget = pop @{ $queue[-1] || [] }
3127 3667 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 3668
3669 pop @queue;
3670 }
3671
3672 delete $queue{$widget+0};
3673
3674 my ($w, $h) = $widget->size_request;
3675
3676 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3677 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3678
3679 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3680 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3681
3682 $w = $widget->{force_w} if exists $widget->{force_w};
3683 $h = $widget->{force_h} if exists $widget->{force_h};
3684
3685 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3686 || delete $widget->{force_realloc}) {
3138 $widget->{req_w} = $w; 3687 $widget->{req_w} = $w;
3139 $widget->{req_h} = $h; 3688 $widget->{req_h} = $h;
3140 3689
3141 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3690 $self->{size_alloc}{$widget+0} = $widget;
3142 3691
3143 $widget->{parent}->check_size
3144 if $widget->{parent}; 3692 if (my $parent = $widget->{parent}) {
3693 $self->{realloc}{$parent+0} = $parent
3694 unless $queue{$parent+0};
3695
3696 $parent->{force_size_alloc} = 1;
3697 $self->{size_alloc}{$parent+0} = $parent;
3698 }
3145 } 3699 }
3700
3701 delete $self->{realloc}{$widget+0};
3146 } 3702 }
3147 } 3703 }
3148 3704
3149 while ($self->{size_alloc}) { 3705 while (my $size_alloc = delete $self->{size_alloc}) {
3150 for (values %{delete $self->{size_alloc}}) { 3706 my @queue = sort { $b->{visible} <=> $a->{visible} }
3151 my ($widget, $w, $h) = @$_; 3707 values %$size_alloc;
3708
3709 while () {
3710 my $widget = pop @queue || last;
3711
3712 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3152 3713
3153 $w = 0 if $w < 0; 3714 $w = 0 if $w < 0;
3154 $h = 0 if $h < 0; 3715 $h = 0 if $h < 0;
3155 3716
3717 $w = int $w + 0.5;
3718 $h = int $h + 0.5;
3719
3720 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3721 $widget->{old_w} = $widget->{w};
3722 $widget->{old_h} = $widget->{h};
3723
3156 $widget->{w} = $w; 3724 $widget->{w} = $w;
3157 $widget->{h} = $h; 3725 $widget->{h} = $h;
3726
3158 $widget->emit (size_allocate => $w, $h); 3727 $widget->emit (size_allocate => $w, $h);
3728 }
3159 } 3729 }
3160 } 3730 }
3161 3731
3162 while ($self->{post_alloc_hook}) { 3732 while ($self->{post_alloc_hook}) {
3163 $_->() 3733 $_->()
3164 for values %{delete $self->{post_alloc_hook}}; 3734 for values %{delete $self->{post_alloc_hook}};
3165 } 3735 }
3736
3166 3737
3167 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3738 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3168 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3739 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3169 glClear GL_COLOR_BUFFER_BIT; 3740 glClear GL_COLOR_BUFFER_BIT;
3170 3741
… …
3172 glLoadIdentity; 3743 glLoadIdentity;
3173 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3744 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3174 glMatrixMode GL_MODELVIEW; 3745 glMatrixMode GL_MODELVIEW;
3175 glLoadIdentity; 3746 glLoadIdentity;
3176 3747
3748 {
3749 package CFClient::UI::Base;
3750
3751 ($draw_x, $draw_y, $draw_w, $draw_h) =
3752 (0, 0, $self->{w}, $self->{h});
3753 }
3754
3177 $self->_draw; 3755 $self->_draw;
3178} 3756}
3179 3757
3180############################################################################# 3758#############################################################################
3181 3759

Diff Legend

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