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.244 by root, Sat May 27 21:06:09 2006 UTC vs.
Revision 1.285 by root, Mon Jun 5 03:07:01 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 return unless $self->{visible}; 273 return unless $self->{visible};
259 274
260 # broken show/hide model 275 $_->set_invisible for $self->children;
261 276
262 delete $self->{root}; 277 delete $self->{root};
263 delete $self->{visible}; 278 delete $self->{visible};
264 279
265 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
266 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
267 282
268 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
269 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
270 285
271 $self->focus_out; 286 $self->focus_out;
272 287
273 $self->emit (visibility_change => 0); 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;
274} 306}
275 307
276sub hide { 308sub hide {
277 my ($self) = @_; 309 my ($self) = @_;
278 310
… …
280 312
281 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
282 if $self->{parent}; 314 if $self->{parent};
283} 315}
284 316
285sub move { 317sub move_abs {
286 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
287 319
288 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
289 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
290 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
291 323
292 $self->update; 324 $self->update;
293} 325}
294 326
295sub set_size { 327sub set_size {
296 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
297 329
298 $self->{user_w} = $w; 330 $self->{force_w} = $w;
299 $self->{user_h} = $h; 331 $self->{force_h} = $h;
300 332
301 $self->check_size; 333 $self->realloc;
302} 334}
303 335
304sub size_request { 336sub size_request {
305 require Carp; 337 require Carp;
306 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
308 340
309sub configure { 341sub configure {
310 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
311 343
312 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
313 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
314 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
315 349
316 # use alignment to adjust x, y 350 # use alignment to adjust x, y
317 351
318 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
319 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
320
321 ($w, $h) = ($w2, $h2);
322 } 354 }
323 355
324 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
325 $self->{x} = $x; 357 $self->{x} = $x;
326 $self->{y} = $y; 358 $self->{y} = $y;
327 $self->update; 359 $self->update;
328 } 360 }
329 361
330 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
331 $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;
332 } 369 }
333} 370}
334 371
335sub size_allocate { 372sub size_allocate {
336 # nothing to be done 373 # nothing to be done
337} 374}
338 375
339sub reconfigure {
340 my ($self) = @_;
341
342 $self->check_size (1);
343 $self->update;
344}
345
346sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
347} 382}
348 383
349sub set_max_size { 384sub set_max_size {
350 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
351 386
352 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
353 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
354} 391}
355 392
356sub set_tooltip { 393sub set_tooltip {
357 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
358 395
… …
363 400
364 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
365 402
366 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
367 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
368 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
369 } 406 }
370} 407}
371 408
372# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
373sub coord2local { 410sub coord2local {
… …
410 447
411 $::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
412 unless $FOCUS; 449 unless $FOCUS;
413} 450}
414 451
415sub mouse_motion { } 452sub mouse_motion { 0 }
416sub button_up { } 453sub button_up { 0 }
417sub key_down { } 454sub key_down { 0 }
418sub key_up { } 455sub key_up { 0 }
419 456
420sub button_down { 457sub button_down {
421 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
422 459
423 $self->focus_in; 460 $self->focus_in;
424}
425 461
426sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
427sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
428sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
429sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
430sub 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
431 538
432sub draw { 539sub draw {
433 my ($self) = @_; 540 my ($self) = @_;
434 541
435 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);
436 553
437 glPushMatrix; 554 glPushMatrix;
438 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
439 $self->_draw;
440 glPopMatrix;
441 556
442 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
443 my ($x, $y) = @$self{qw(x y)};
444
445 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
446 glEnable GL_BLEND; 559 glEnable GL_BLEND;
447 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
448 glBegin GL_QUADS; 561 glBegin GL_QUADS;
449 glVertex $x , $y; 562 glVertex 0 , 0;
450 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
451 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
452 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
453 glEnd; 566 glEnd;
454 glDisable GL_BLEND; 567 glDisable GL_BLEND;
455 } 568 }
456 569
457 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
458 glPushMatrix; 571 glPushMatrix;
459 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
460 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
461 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
462 glVertex 0 , 0; 575 glVertex 0 , 0;
463 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
464 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
465 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
466 glEnd; 579 glEnd;
467 glPopMatrix; 580 glPopMatrix;
468 #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;
469 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
470} 586}
471 587
472sub _draw { 588sub _draw {
473 my ($self) = @_; 589 my ($self) = @_;
474 590
475 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
476}
477
478sub find_widget {
479 my ($self, $x, $y) = @_;
480
481 return () unless $self->{can_events};
482
483 return $self
484 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
485 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
486
487 ()
488}
489
490sub set_parent {
491 my ($self, $parent) = @_;
492
493 Scalar::Util::weaken ($self->{parent} = $parent);
494
495 if ($parent->{visible} || 1) {
496 $self->{root} = $parent->{root};
497 $self->{visible} = $parent->{visible} + 1;
498
499 $self->emit (visibility_change => 1)
500 unless $self->{parent}{visible};
501 }
502
503 # TODO: req_w _does_change after ->reconfigure
504 $self->check_size
505 unless exists $self->{req_w};
506
507 $self->show;
508}
509
510sub check_size {
511 my ($self, $forced) = @_;
512
513 $self->{force_alloc} = 1 if $forced;
514 $CFClient::UI::ROOT->{check_size}{$self} = $self;
515}
516
517sub update {
518 my ($self) = @_;
519
520 $self->{parent}->update
521 if $self->{parent};
522}
523
524sub connect {
525 my ($self, $signal, $cb) = @_;
526
527 push @{ $self->{signal_cb}{$signal} }, $cb;
528}
529
530sub _emit {
531 my ($self, $signal, @args) = @_;
532
533 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
534}
535
536sub emit {
537 my ($self, $signal, @args) = @_;
538
539 $self->_emit ($signal, @args)
540 || $self->$signal (@args);
541}
542
543sub visibility_change {
544 #my ($self, $visible) = @_;
545} 592}
546 593
547sub DESTROY { 594sub DESTROY {
548 my ($self) = @_; 595 my ($self) = @_;
549 596
… …
581 628
582 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
583 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
584 631
585 glEnable GL_BLEND; 632 glEnable GL_BLEND;
586 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
587 glColor @$color; 634 glColor_premultiply @$color;
588 635
589 glBegin GL_QUADS; 636 glBegin GL_QUADS;
590 glVertex 0 , 0; 637 glVertex 0 , 0;
591 glVertex 0 , $h; 638 glVertex 0 , $h;
592 glVertex $w, $h; 639 glVertex $w, $h;
… …
607 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
608 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
609} 656}
610 657
611sub size_request { 658sub size_request {
612 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
613} 662}
614 663
615sub draw { } 664sub draw { }
616 665
617############################################################################# 666#############################################################################
… …
621our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
622 671
623sub new { 672sub new {
624 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
625 674
626 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
627 676
628 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
629 children => [], 678 children => [],
630 can_events => 0, 679 can_events => 0,
631 %arg, 680 %arg,
632 ); 681 );
682
633 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
634 685
635 $self 686 $self
636} 687}
637 688
638sub add { 689sub add {
… …
646 $self->{children} = [ 697 $self->{children} = [
647 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
648 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
649 ]; 700 ];
650 701
651 $self->check_size (1); 702 $self->realloc;
652 $self->update;
653} 703}
654 704
655sub children { 705sub children {
656 @{ $_[0]{children} } 706 @{ $_[0]{children} }
657} 707}
… …
662 delete $child->{parent}; 712 delete $child->{parent};
663 $child->hide; 713 $child->hide;
664 714
665 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
666 716
667 $self->check_size (1); 717 $self->realloc;
668 $self->update;
669} 718}
670 719
671sub clear { 720sub clear {
672 my ($self) = @_; 721 my ($self) = @_;
673 722
… …
677 for (@$children) { 726 for (@$children) {
678 delete $_->{parent}; 727 delete $_->{parent};
679 $_->hide; 728 $_->hide;
680 } 729 }
681 730
682 $self->check_size; 731 $self->realloc;
683 $self->update;
684} 732}
685 733
686sub find_widget { 734sub find_widget {
687 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
688 736
689 $x -= $self->{x}; 737 $x -= $self->{x};
690 $y -= $self->{y}; 738 $y -= $self->{y};
691 739
692 my $res; 740 my $res;
693 741
694 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
695 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
696 and return $res; 744 and return $res;
697 } 745 }
698 746
699 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
748 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
749} 797}
750 798
751############################################################################# 799#############################################################################
752 800
801# back-buffered drawing area
802
753package CFClient::UI::Window; 803package CFClient::UI::Window;
754 804
755our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
756 806
757use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
775 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
776 $self->update; 826 $self->update;
777} 827}
778 828
779sub _render { 829sub _render {
830 my ($self) = @_;
831
780 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
781} 833}
782 834
783sub render_child { 835sub render_child {
784 my ($self) = @_; 836 my ($self) = @_;
785 837
786 $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 {
787 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
788 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
789 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
790 $self->_render; 849 $self->_render;
791 }; 850 };
792} 851}
793 852
794sub _draw { 853sub _draw {
795 my ($self) = @_; 854 my ($self) = @_;
796 855
797 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
798 857
799 my $tex = $self->{texture} 858 my $tex = $self->{texture}
800 or return; 859 or return;
801 860
802 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
803 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
804 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
805 864
806 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
807 866
808 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
809} 868}
… …
825} 884}
826 885
827sub size_request { 886sub size_request {
828 my ($self) = @_; 887 my ($self) = @_;
829 888
830 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
831 890
832 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
833} 895}
834 896
835sub size_allocate { 897sub size_allocate {
836 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
837 899
900 my $child = $self->child;
901
838 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
839 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
840 904
841 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
842 $self->update; 906 $self->update;
843} 907}
844 908
… …
880} 944}
881 945
882sub _render { 946sub _render {
883 my ($self) = @_; 947 my ($self) = @_;
884 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
885 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
886 953
887 $self->SUPER::_render; 954 $self->SUPER::_render;
888} 955}
889 956
… …
892package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
893 960
894our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
895 962
896sub new { 963sub new {
897 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
898 967
899 my $self; 968 my $self;
900 969
901 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
902 vertical => 1, 971 vertical => 1,
… …
907 ; 976 ;
908 977
909 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
910 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
911 slider => $slider, 980 slider => $slider,
912 @_, 981 %arg,
913 ); 982 );
914 983
915 $self->{vp}->add ($self->{scrolled});
916 $self->add ($self->{vp});
917 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
918 986
919 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
920} 994}
921 995
922sub update { 996sub update {
923 my ($self) = @_; 997 my ($self) = @_;
924 998
… …
963 1037
964 if ($self->{bg}) { 1038 if ($self->{bg}) {
965 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
966 1040
967 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
968 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
969 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
970 1044
971 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
972 glVertex 0 , 0; 1046 glVertex 0 , 0;
973 glVertex 0 , $h; 1047 glVertex 0 , $h;
974 glVertex $w, $h; 1048 glVertex $w, $h;
… …
987 1061
988our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
989 1063
990use CFClient::OpenGL; 1064use CFClient::OpenGL;
991 1065
992my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
993 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
994 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);
995 1073
996sub new { 1074sub new {
997 my $class = shift; 1075 my ($class, %arg) = @_;
998 1076
999 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
1000 1078
1001 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
1002 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
1003 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
1004 border => 0.6, 1082 border => 0.6,
1005 is_toplevel => 1,
1006 can_events => 1, 1083 can_events => 1,
1007 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
1008 ); 1087 );
1009 1088
1010 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
1011 align => 0, 1090 align => 0,
1012 valign => 1, 1091 valign => 1,
1013 text => $self->{title}, 1092 text => $title,
1014 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
1015 1095
1016 $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};
1017} 1104}
1018 1105
1019sub border { 1106sub border {
1020 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
1021} 1108}
1022 1109
1023sub size_request { 1110sub size_request {
1024 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
1025 1115
1026 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
1027 1117
1028 ( 1118 (
1029 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
1032} 1122}
1033 1123
1034sub size_allocate { 1124sub size_allocate {
1035 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
1036 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
1037 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
1038 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
1039 1137
1040 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
1041 if $self->{title};
1042
1043 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
1044} 1139}
1045 1140
1046sub button_down { 1141sub button_down {
1047 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
1048 1143
… …
1064 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1065 1160
1066 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1067 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1068 1163
1069 $self->{user_x} = $wx + $dx * $mx;
1070 $self->{user_y} = $wy + $dy * $my;
1071 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1072 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1073 $self->move ($self->{user_x}, $self->{user_y}); 1166
1074 $self->check_size; 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1168 $self->realloc;
1075 }; 1169 };
1076 1170
1077 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1078 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1079 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1081 $self->{motion} = sub { 1175 $self->{motion} = sub {
1082 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1083 1177
1084 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1085 1179
1086 $self->{user_x} = $bx + $x - $ox; 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1087 $self->{user_y} = $by + $y - $oy; 1181 # HACK: the next line is required to enforce placement
1088 $self->move ($self->{user_x}, $self->{user_y}); 1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1089 $self->update;
1090 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1091 } 1188 1
1092} 1189}
1093 1190
1094sub button_up { 1191sub button_up {
1095 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1096 1193
1097 delete $self->{motion}; 1194 !!delete $self->{motion}
1098} 1195}
1099 1196
1100sub mouse_motion { 1197sub mouse_motion {
1101 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1102 1199
1103 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1104} 1203}
1105 1204
1106sub _draw { 1205sub _draw {
1107 my ($self) = @_; 1206 my ($self) = @_;
1108 1207
1208 my $child = $self->{children}[0];
1209
1109 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1110 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1111 1212
1112 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1113 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1114 1215
1115 my $border = $self->border; 1216 my $border = $self->border;
1116 1217
1117 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1118 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1119 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1120 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1121 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1122 1223
1123 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1124 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1125 1226
1126 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1127 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1128 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1129
1130 glColor @{ $self->{bg} };
1131
1132 $bg->{s} = $rep_x;
1133 $bg->{t} = $rep_y;
1134 $bg->{wrap_mode} = 1;
1135 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1136 } 1232 }
1137 1233
1138 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1139 1235
1140 $self->{title}->draw if $self->{title};
1141
1142 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1143} 1242}
1144 1243
1145############################################################################# 1244#############################################################################
1146 1245
1147package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1169 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1170 1269
1171 $child->set_parent ($self); 1270 $child->set_parent ($self);
1172 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1173 1272
1174 $self->check_size (1); 1273 $self->realloc;
1175} 1274}
1176 1275
1177# 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?
1178sub clear { 1277sub clear {
1179 my ($self) = @_; 1278 my ($self) = @_;
… …
1184 for (@children) { 1283 for (@children) {
1185 delete $_->{parent}; 1284 delete $_->{parent};
1186 $_->hide; 1285 $_->hide;
1187 } 1286 }
1188 1287
1189 $self->check_size (1); 1288 $self->realloc;
1190 $self->update;
1191} 1289}
1192 1290
1193sub get_wh { 1291sub get_wh {
1194 my ($self) = @_; 1292 my ($self) = @_;
1195 1293
… …
1291 } 1389 }
1292} 1390}
1293 1391
1294############################################################################# 1392#############################################################################
1295 1393
1296package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1297
1298# TODO: wrap into common Box base class
1299 1395
1300our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1301 1397
1302sub size_request { 1398sub size_request {
1303 my ($self) = @_; 1399 my ($self) = @_;
1304 1400
1305 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1306 1402 ? (
1307 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1308 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1309 (List::Util::max map $_->[1], @alloc), 1405 )
1310 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1311} 1410}
1312 1411
1313sub size_allocate { 1412sub size_allocate {
1314 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1315 1414
1316 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1317
1318 my $children = $self->{children}; 1416 my $children = $self->{children};
1319 1417
1320 my @h = map $_->{req_w}, @$children; 1418 my @req;
1321 1419
1322 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1323 1421 @req = ($space / (@$children || 1)) x @$children;
1324 if ($req_h > $h) {
1325 # ah well, not enough space
1326 $_ *= $h / $req_h for @h;
1327 } 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 {
1328 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1329 $exp ||= 1;
1330 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1331 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1332 my $child = $children->[$_];
1333
1334 my $alloc_h = $h[$_];
1335 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1336 $h[$_] = $alloc_h;
1337 } 1436 }
1338 } 1437 }
1339 1438
1340 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1341 1440
1342 my $y = 0; 1441 my $pos = 0;
1343 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1344 my $child = $children->[$_];
1345 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1346 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1347 1445
1348 $y += $h; 1446 $pos += $alloc;
1349 } 1447 }
1350 1448
1351 1 1449 1
1352} 1450}
1353 1451
1354############################################################################# 1452#############################################################################
1355 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
1356package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1357 1470
1358# TODO: wrap into common Box base class
1359
1360our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1361 1472
1362sub size_request { 1473sub new {
1363 my ($self) = @_; 1474 my $class = shift;
1364 1475
1365 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1366 1477 vertical => 1,
1367 ( 1478 @_,
1368 (List::Util::max map $_->[0], @alloc),
1369 (List::Util::sum map $_->[1], @alloc),
1370 ) 1479 )
1371}
1372
1373sub size_allocate {
1374 my ($self, $w, $h) = @_;
1375
1376 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1377
1378 my $children = $self->{children};
1379
1380 my @h = map $_->{req_h}, @$children;
1381
1382 my $req_h = List::Util::sum @h;
1383
1384 if ($req_h > $h) {
1385 # ah well, not enough space
1386 $_ *= $h / $req_h for @h;
1387 } else {
1388 my $exp = List::Util::sum map $_->{expand}, @$children;
1389 $exp ||= 1;
1390
1391 for (0 .. $#$children) {
1392 my $child = $children->[$_];
1393
1394 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1395 }
1396 }
1397
1398 CFClient::UI::harmonize \@h;
1399
1400 my $y = 0;
1401 for (0 .. $#$children) {
1402 my $child = $children->[$_];
1403 my $h = $h[$_];
1404 $child->configure (0, $y, $w, $h);
1405
1406 $y += $h;
1407 }
1408
1409 1
1410} 1480}
1411 1481
1412############################################################################# 1482#############################################################################
1413 1483
1414package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1431 ellipsise => 3, # end 1501 ellipsise => 3, # end
1432 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1433 fontsize => 1, 1503 fontsize => 1,
1434 align => -1, 1504 align => -1,
1435 valign => -1, 1505 valign => -1,
1436 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1437 can_events => 0, 1508 can_events => 0,
1438 %arg 1509 %arg
1439 ); 1510 );
1440 1511
1441 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1468 1539
1469 delete $self->{texture}; 1540 delete $self->{texture};
1470 $self->SUPER::update; 1541 $self->SUPER::update;
1471} 1542}
1472 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1473sub set_text { 1551sub set_text {
1474 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1475 1553
1476 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1477 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1478 1556
1479 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1480 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1481 1560
1561 $self->realloc;
1482 $self->update; 1562 $self->update;
1483 $self->check_size;
1484} 1563}
1485 1564
1486sub set_markup { 1565sub set_markup {
1487 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1488 1567
… …
1491 1570
1492 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1493 1572
1494 $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;
1495 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1496 1576
1577 $self->realloc;
1497 $self->update; 1578 $self->update;
1498 $self->check_size;
1499} 1579}
1500 1580
1501sub size_request { 1581sub size_request {
1502 my ($self) = @_; 1582 my ($self) = @_;
1503 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1504 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1505 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1506 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1507 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1508 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1509 1592
1510 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1511 1594
1512 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1513 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1514 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1515 1598
1516 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1517 1600
1518 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1519 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1520 } 1603 }
1521 1604
1605 ($w, $h)
1522 ( 1606 }
1523 $w + $self->{padding} * 2,
1524 $h + $self->{padding} * 2,
1525 )
1526} 1607}
1527 1608
1528sub size_allocate { 1609sub size_allocate {
1529 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1530 1611
1612 delete $self->{ox};
1613
1531 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1532} 1616}
1533 1617
1534sub set_fontsize { 1618sub set_fontsize {
1535 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1536 1620
1537 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1538 delete $self->{texture}; 1622 delete $self->{texture};
1539 1623
1540 $self->update; 1624 $self->realloc;
1541 $self->check_size;
1542} 1625}
1543 1626
1544sub _draw { 1627sub _draw {
1545 my ($self) = @_; 1628 my ($self) = @_;
1546 1629
… …
1552 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1553 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1554 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1555 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1556 1639
1557 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1558 1642
1643 unless (exists $self->{ox}) {
1559 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1560 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1561 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1562 1647
1563 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1564 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1565 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1566
1567 $tex
1568 }; 1651 };
1569 1652
1570 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1571 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1654 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1572 1655
1656 glColor_premultiply @{$self->{fg}}
1573 if ($tex->{format} == GL_ALPHA) { 1657 if $tex->{format} == GL_ALPHA;
1574 glColor @{$self->{fg}}; 1658
1575 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1576 } else {
1577 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1659 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1578 }
1579 1660
1580 glDisable GL_TEXTURE_2D; 1661 glDisable GL_TEXTURE_2D;
1581} 1662}
1582 1663
1583############################################################################# 1664#############################################################################
… …
1610 1691
1611 delete $self->{cur_h}; 1692 delete $self->{cur_h};
1612 1693
1613 return if $self->{text} eq $text; 1694 return if $self->{text} eq $text;
1614 1695
1615 delete $self->{texture};
1616
1617 $self->{last_activity} = $::NOW; 1696 $self->{last_activity} = $::NOW;
1618 $self->{text} = $text; 1697 $self->{text} = $text;
1619 1698
1620 $text =~ s/./*/g if $self->{hidden}; 1699 $text =~ s/./*/g if $self->{hidden};
1621 $self->{layout}->set_text ("$text "); 1700 $self->{layout}->set_text ("$text ");
1701 delete $self->{req_h};
1622 1702
1623 $self->_emit (changed => $self->{text}); 1703 $self->_emit (changed => $self->{text});
1704
1705 $self->realloc;
1706 $self->update;
1624} 1707}
1625 1708
1626sub set_text { 1709sub set_text {
1627 my ($self, $text) = @_; 1710 my ($self, $text) = @_;
1628 1711
1629 $self->{cursor} = length $text; 1712 $self->{cursor} = length $text;
1630 $self->_set_text ($text); 1713 $self->_set_text ($text);
1631 $self->update;
1632 $self->check_size;
1633} 1714}
1634 1715
1635sub get_text { 1716sub get_text {
1636 $_[0]{text} 1717 $_[0]{text}
1637} 1718}
… …
1667 $self->{cursor} = length $text; 1748 $self->{cursor} = length $text;
1668 } elsif ($uni == 27) { 1749 } elsif ($uni == 27) {
1669 $self->_emit ('escape'); 1750 $self->_emit ('escape');
1670 } elsif ($uni) { 1751 } elsif ($uni) {
1671 substr $text, $self->{cursor}++, 0, chr $uni; 1752 substr $text, $self->{cursor}++, 0, chr $uni;
1753 } else {
1754 return 0;
1672 } 1755 }
1673 1756
1674 $self->_set_text ($text); 1757 $self->_set_text ($text);
1675 $self->update; 1758
1676 $self->check_size; 1759 $self->realloc;
1760
1761 1
1677} 1762}
1678 1763
1679sub focus_in { 1764sub focus_in {
1680 my ($self) = @_; 1765 my ($self) = @_;
1681 1766
… …
1696 utf8::encode $text; 1781 utf8::encode $text;
1697 $self->{cursor} = length substr $text, 0, $idx; 1782 $self->{cursor} = length substr $text, 0, $idx;
1698 1783
1699 $self->_set_text ($self->{text}); 1784 $self->_set_text ($self->{text});
1700 $self->update; 1785 $self->update;
1786
1787 1
1701} 1788}
1702 1789
1703sub mouse_motion { 1790sub mouse_motion {
1704 my ($self, $ev, $x, $y) = @_; 1791 my ($self, $ev, $x, $y) = @_;
1705# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1792# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1793
1794 0
1706} 1795}
1707 1796
1708sub _draw { 1797sub _draw {
1709 my ($self) = @_; 1798 my ($self) = @_;
1710 1799
1711 local $self->{fg} = $self->{fg}; 1800 local $self->{fg} = $self->{fg};
1712 1801
1713 if ($FOCUS == $self) { 1802 if ($FOCUS == $self) {
1714 glColor @{$self->{active_bg}}; 1803 glColor_premultiply @{$self->{active_bg}};
1715 $self->{fg} = $self->{active_fg}; 1804 $self->{fg} = $self->{active_fg};
1716 } else { 1805 } else {
1717 glColor @{$self->{bg}}; 1806 glColor_premultiply @{$self->{bg}};
1718 } 1807 }
1719 1808
1720 glEnable GL_BLEND; 1809 glEnable GL_BLEND;
1721 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1810 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1722 glBegin GL_QUADS; 1811 glBegin GL_QUADS;
1723 glVertex 0 , 0; 1812 glVertex 0 , 0;
1724 glVertex 0 , $self->{h}; 1813 glVertex 0 , $self->{h};
1725 glVertex $self->{w}, $self->{h}; 1814 glVertex $self->{w}, $self->{h};
1726 glVertex $self->{w}, 0; 1815 glVertex $self->{w}, 0;
… …
1787 } else { 1876 } else {
1788 $self->set_text ($self->{history_saveback}); 1877 $self->set_text ($self->{history_saveback});
1789 } 1878 }
1790 1879
1791 } else { 1880 } else {
1792 $self->SUPER::key_down ($ev); 1881 return $self->SUPER::key_down ($ev)
1882 }
1883
1793 } 1884 1
1794
1795} 1885}
1796 1886
1797############################################################################# 1887#############################################################################
1798 1888
1799package CFClient::UI::Button; 1889package CFClient::UI::Button;
… …
1808 1898
1809sub new { 1899sub new {
1810 my $class = shift; 1900 my $class = shift;
1811 1901
1812 $class->SUPER::new ( 1902 $class->SUPER::new (
1813 padding => 4, 1903 padding_x => 4,
1904 padding_y => 4,
1814 fg => [1, 1, 1], 1905 fg => [1, 1, 1],
1815 active_fg => [0, 0, 1], 1906 active_fg => [0, 0, 1],
1816 can_hover => 1, 1907 can_hover => 1,
1817 align => 0, 1908 align => 0,
1818 valign => 0, 1909 valign => 0,
… …
1827 my ($self, $ev, $x, $y) = @_; 1918 my ($self, $ev, $x, $y) = @_;
1828 1919
1829 $self->emit ("activate") 1920 $self->emit ("activate")
1830 if $x >= 0 && $x < $self->{w} 1921 if $x >= 0 && $x < $self->{w}
1831 && $y >= 0 && $y < $self->{h}; 1922 && $y >= 0 && $y < $self->{h};
1923
1924 1
1832} 1925}
1833 1926
1834sub _draw { 1927sub _draw {
1835 my ($self) = @_; 1928 my ($self) = @_;
1836 1929
1837 local $self->{fg} = $self->{fg}; 1930 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1838
1839 if ($GRAB == $self) {
1840 $self->{fg} = $self->{active_fg};
1841 }
1842 1931
1843 glEnable GL_TEXTURE_2D; 1932 glEnable GL_TEXTURE_2D;
1844 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1933 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1845 glColor 0, 0, 0, 1; 1934 glColor 0, 0, 0, 1;
1846 1935
… …
1865 1954
1866sub new { 1955sub new {
1867 my $class = shift; 1956 my $class = shift;
1868 1957
1869 $class->SUPER::new ( 1958 $class->SUPER::new (
1870 padding => 2, 1959 padding_x => 2,
1960 padding_y => 2,
1871 fg => [1, 1, 1], 1961 fg => [1, 1, 1],
1872 active_fg => [1, 1, 0], 1962 active_fg => [1, 1, 0],
1873 bg => [0, 0, 0, 0.2], 1963 bg => [0, 0, 0, 0.2],
1874 active_bg => [1, 1, 1, 0.5], 1964 active_bg => [1, 1, 1, 0.5],
1875 state => 0, 1965 state => 0,
… …
1879} 1969}
1880 1970
1881sub size_request { 1971sub size_request {
1882 my ($self) = @_; 1972 my ($self) = @_;
1883 1973
1884 ($self->{padding} * 2 + 6) x 2 1974 (6) x 2
1885} 1975}
1886 1976
1887sub button_down { 1977sub button_down {
1888 my ($self, $ev, $x, $y) = @_; 1978 my ($self, $ev, $x, $y) = @_;
1889 1979
1890 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1980 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1891 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1981 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1892 $self->{state} = !$self->{state}; 1982 $self->{state} = !$self->{state};
1893 $self->_emit (changed => $self->{state}); 1983 $self->_emit (changed => $self->{state});
1984 } else {
1985 return 0
1986 }
1987
1894 } 1988 1
1895} 1989}
1896 1990
1897sub _draw { 1991sub _draw {
1898 my ($self) = @_; 1992 my ($self) = @_;
1899 1993
1900 $self->SUPER::_draw; 1994 $self->SUPER::_draw;
1901 1995
1902 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1996 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1903 1997
1904 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1998 my ($w, $h) = @$self{qw(w h)};
1999
2000 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1905 2001
1906 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2002 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1907 2003
1908 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2004 my $tex = $self->{state} ? $tex[1] : $tex[0];
1909 2005
… …
2064 2160
2065 my $h1 = $self->{h} * (1 - $ycut1); 2161 my $h1 = $self->{h} * (1 - $ycut1);
2066 my $h2 = $self->{h} * (1 - $ycut2); 2162 my $h2 = $self->{h} * (1 - $ycut2);
2067 2163
2068 glEnable GL_BLEND; 2164 glEnable GL_BLEND;
2069 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2165 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2166 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2070 glEnable GL_TEXTURE_2D; 2167 glEnable GL_TEXTURE_2D;
2071 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2168 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2072 2169
2073 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2170 glBindTexture GL_TEXTURE_2D, $t1->{name};
2074 glBegin GL_QUADS; 2171 glBegin GL_QUADS;
… …
2174 fg => [1, 1, 1], 2271 fg => [1, 1, 1],
2175 active_fg => [0, 0, 0], 2272 active_fg => [0, 0, 0],
2176 bg => [0, 0, 0, 0.2], 2273 bg => [0, 0, 0, 0.2],
2177 active_bg => [1, 1, 1, 0.5], 2274 active_bg => [1, 1, 1, 0.5],
2178 range => [0, 0, 100, 10, 0], 2275 range => [0, 0, 100, 10, 0],
2179 req_w => $::WIDTH / 80, 2276 min_w => $::WIDTH / 80,
2180 req_h => $::WIDTH / 80, 2277 min_h => $::WIDTH / 80,
2181 vertical => 0, 2278 vertical => 0,
2182 can_hover => 1, 2279 can_hover => 1,
2183 inner_pad => 0.02, 2280 inner_pad => 0.02,
2184 @_ 2281 @_
2185 ); 2282 );
… …
2188 $self->update; 2285 $self->update;
2189 2286
2190 $self 2287 $self
2191} 2288}
2192 2289
2290sub changed { }
2291
2193sub set_range { 2292sub set_range {
2194 my ($self, $range) = @_; 2293 my ($self, $range) = @_;
2195 2294
2196 ($range, $self->{range}) = ($self->{range}, $range); 2295 ($range, $self->{range}) = ($self->{range}, $range);
2197 2296
… …
2223} 2322}
2224 2323
2225sub size_request { 2324sub size_request {
2226 my ($self) = @_; 2325 my ($self) = @_;
2227 2326
2228 my $w = $self->{req_w}; 2327 ($self->{req_w}, $self->{req_h})
2229 my $h = $self->{req_h};
2230
2231 $self->{vertical} ? ($h, $w) : ($w, $h)
2232} 2328}
2233 2329
2234sub button_down { 2330sub button_down {
2235 my ($self, $ev, $x, $y) = @_; 2331 my ($self, $ev, $x, $y) = @_;
2236 2332
2237 $self->SUPER::button_down ($ev, $x, $y); 2333 $self->SUPER::button_down ($ev, $x, $y);
2238 2334
2239 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2335 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2240 2336
2241 $self->mouse_motion ($ev, $x, $y); 2337 $self->mouse_motion ($ev, $x, $y)
2242} 2338}
2243 2339
2244sub mouse_motion { 2340sub mouse_motion {
2245 my ($self, $ev, $x, $y) = @_; 2341 my ($self, $ev, $x, $y) = @_;
2246 2342
… …
2250 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2346 my (undef, $lo, $hi, $page) = @{$self->{range}};
2251 2347
2252 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2348 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2253 2349
2254 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2350 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2351 } else {
2352 return 0;
2353 }
2354
2255 } 2355 1
2256} 2356}
2257 2357
2258sub update { 2358sub update {
2259 my ($self) = @_; 2359 my ($self) = @_;
2260 2360
2261 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2361 delete $self->{knob_w};
2362 $self->SUPER::update;
2363}
2364
2365sub _draw {
2366 my ($self) = @_;
2367
2368 unless ($self->{knob_w}) {
2262 $self->set_value ($self->{range}[0]); 2369 $self->set_value ($self->{range}[0]);
2263 2370
2264 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2371 my ($value, $lo, $hi, $page) = @{$self->{range}};
2265 my $range = ($hi - $page - $lo) || 1e-100; 2372 my $range = ($hi - $page - $lo) || 1e-100;
2266 2373
… …
2272 $value = ($value - $lo) / $range; 2379 $value = ($value - $lo) / $range;
2273 $value = $value * $self->{scale} + $self->{offset}; 2380 $value = $value * $self->{scale} + $self->{offset};
2274 2381
2275 $self->{knob_x} = $value - $knob_w * 0.5; 2382 $self->{knob_x} = $value - $knob_w * 0.5;
2276 $self->{knob_w} = $knob_w; 2383 $self->{knob_w} = $knob_w;
2277 }); 2384 }
2278
2279 $self->SUPER::update;
2280}
2281
2282sub _draw {
2283 my ($self) = @_;
2284 2385
2285 $self->SUPER::_draw (); 2386 $self->SUPER::_draw ();
2286 2387
2287 glScale $self->{w}, $self->{h}; 2388 glScale $self->{w}, $self->{h};
2288 2389
… …
2482 2583
2483 delete $self->{texture}; 2584 delete $self->{texture};
2484 } 2585 }
2485 2586
2486 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2587 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2487 glClearColor 0.5, 0.5, 0.5, 0; 2588 glClearColor 0, 0, 0, 0;
2488 glClear GL_COLOR_BUFFER_BIT; 2589 glClear GL_COLOR_BUFFER_BIT;
2489 2590
2490 my $top = int $self->{children}[1]{range}[0]; 2591 my $top = int $self->{children}[1]{range}[0];
2491 2592
2492 my $y0 = $top; 2593 my $y0 = $top;
… …
2527sub _draw { 2628sub _draw {
2528 my ($self) = @_; 2629 my ($self) = @_;
2529 2630
2530 glEnable GL_TEXTURE_2D; 2631 glEnable GL_TEXTURE_2D;
2531 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2632 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532 glColor 1, 1, 1, 1; 2633 glColor 0, 0, 0, 1;
2533 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2634 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2534 glDisable GL_TEXTURE_2D; 2635 glDisable GL_TEXTURE_2D;
2535 2636
2536 $self->{children}[1]->draw; 2637 $self->{children}[1]->draw;
2537 2638
2538} 2639}
… …
2592 state => 0, 2693 state => 0,
2593 on_activate => \&toggle_flopper, 2694 on_activate => \&toggle_flopper,
2594 @_ 2695 @_
2595 ); 2696 );
2596 2697
2597 if ($self->{state}) {
2598 $self->{state} = 0;
2599 $self->toggle_flopper;
2600 }
2601
2602 $self 2698 $self
2603} 2699}
2604 2700
2605sub toggle_flopper { 2701sub toggle_flopper {
2606 my ($self) = @_; 2702 my ($self) = @_;
2607 2703
2608 # TODO: use animation 2704 $self->{other}->toggle_visibility;
2609 if ($self->{state} = !$self->{state}) {
2610 $CFClient::UI::ROOT->add ($self->{other});
2611 $self->{other}->move ($self->coord2global (0, $self->{h}));
2612 $self->_emit ("open");
2613 } else {
2614 $CFClient::UI::ROOT->remove ($self->{other});
2615 $self->_emit ("close");
2616 }
2617
2618 $self->_emit (changed => $self->{state});
2619} 2705}
2620 2706
2621############################################################################# 2707#############################################################################
2622 2708
2623package CFClient::UI::Tooltip; 2709package CFClient::UI::Tooltip;
… …
2636} 2722}
2637 2723
2638sub set_tooltip_from { 2724sub set_tooltip_from {
2639 my ($self, $widget) = @_; 2725 my ($self, $widget) = @_;
2640 2726
2727 my $tooltip = $widget->{tooltip};
2728
2729 if ($ENV{CFPLUS_DEBUG} & 2) {
2730 $tooltip .= "\n\n" . (ref $widget) . "\n"
2731 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2732 . "req $widget->{req_w} $widget->{req_h}\n"
2733 . "visible $widget->{visible}";
2734 }
2735
2641 $self->add (new CFClient::UI::Label 2736 $self->add (new CFClient::UI::Label
2642 markup => $widget->{tooltip}, 2737 markup => $tooltip,
2643 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2738 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2644 fontsize => 0.8, 2739 fontsize => 0.8,
2645 fg => [0, 0, 0, 1], 2740 fg => [0, 0, 0, 1],
2646 ellipsise => 0, 2741 ellipsise => 0,
2647 font => ($widget->{tooltip_font} || $::FONT_PROP), 2742 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2658 2753
2659sub size_allocate { 2754sub size_allocate {
2660 my ($self, $w, $h) = @_; 2755 my ($self, $w, $h) = @_;
2661 2756
2662 $self->SUPER::size_allocate ($w - 4, $h - 4); 2757 $self->SUPER::size_allocate ($w - 4, $h - 4);
2758}
2759
2760sub visibility_change {
2761 my ($self, $visible) = @_;
2762
2763 return unless $visible;
2764
2765 $self->{root}->on_post_alloc ("move_$self" => sub {
2766 my $widget = $self->{owner}
2767 or return;
2768
2769 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2770
2771 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2772 if $x + $self->{w} > $::WIDTH;
2773
2774 $self->move_abs ($x, $y);
2775 });
2663} 2776}
2664 2777
2665sub _draw { 2778sub _draw {
2666 my ($self) = @_; 2779 my ($self) = @_;
2667 2780
… …
2684 glVertex $w, $h; 2797 glVertex $w, $h;
2685 glVertex $w, 0; 2798 glVertex $w, 0;
2686 glEnd; 2799 glEnd;
2687 2800
2688 glTranslate 2 - 0.375, 2 - 0.375; 2801 glTranslate 2 - 0.375, 2 - 0.375;
2802
2689 $self->SUPER::_draw; 2803 $self->SUPER::_draw;
2690} 2804}
2691 2805
2692############################################################################# 2806#############################################################################
2693 2807
… …
2752 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2866 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2753 2867
2754 if ($tex) { 2868 if ($tex) {
2755 glEnable GL_TEXTURE_2D; 2869 glEnable GL_TEXTURE_2D;
2756 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2870 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2757 glColor 1, 1, 1, 1; 2871 glColor 0, 0, 0, 1;
2758 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2872 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2759 glDisable GL_TEXTURE_2D; 2873 glDisable GL_TEXTURE_2D;
2760 } 2874 }
2761} 2875}
2762 2876
… …
2769 $self->SUPER::DESTROY; 2883 $self->SUPER::DESTROY;
2770} 2884}
2771 2885
2772############################################################################# 2886#############################################################################
2773 2887
2774package CFClient::UI::Inventory; 2888package CFClient::UI::Buttonbar;
2775 2889
2776our @ISA = CFClient::UI::ScrolledWindow::; 2890our @ISA = CFClient::UI::HBox::;
2777 2891
2778sub new { 2892# TODO: should actualyl wrap buttons and other goodies.
2779 my $class = shift;
2780
2781 my $self = $class->SUPER::new (
2782 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2783 @_,
2784 );
2785
2786 $self
2787}
2788
2789sub set_items {
2790 my ($self, $items) = @_;
2791
2792 $self->{scrolled}->clear;
2793 return unless $items;
2794
2795 my @items = sort {
2796 ($a->{type} <=> $b->{type})
2797 or ($a->{name} cmp $b->{name})
2798 } @$items;
2799
2800 $self->{real_items} = \@items;
2801
2802 my $row = 0;
2803 for my $item (@items) {
2804 CFClient::Item::update_widgets $item;
2805
2806 $self->{scrolled}->add (0, $row, $item->{face_widget});
2807 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2808 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2809
2810 $row++;
2811 }
2812}
2813
2814sub size_request {
2815 my ($self) = @_;
2816 ($self->{req_w}, $self->{req_h});
2817}
2818 2893
2819############################################################################# 2894#############################################################################
2820 2895
2821package CFClient::UI::Menu; 2896package CFClient::UI::Menu;
2822 2897
… …
2863 # maybe save $GRAB? must be careful about events... 2938 # maybe save $GRAB? must be careful about events...
2864 $GRAB = $self; 2939 $GRAB = $self;
2865 $self->{button} = $ev->{button}; 2940 $self->{button} = $ev->{button};
2866 2941
2867 $self->show; 2942 $self->show;
2868 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2943 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2869} 2944}
2870 2945
2871sub mouse_motion { 2946sub mouse_motion {
2872 my ($self, $ev, $x, $y) = @_; 2947 my ($self, $ev, $x, $y) = @_;
2873 2948
2874 # TODO: should use vbox->find_widget or so 2949 # TODO: should use vbox->find_widget or so
2875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2950 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2876 $self->{hover} = $self->{item}{$HOVER}; 2951 $self->{hover} = $self->{item}{$HOVER};
2952
2953 0
2877} 2954}
2878 2955
2879sub button_up { 2956sub button_up {
2880 my ($self, $ev, $x, $y) = @_; 2957 my ($self, $ev, $x, $y) = @_;
2881 2958
… …
2883 undef $GRAB; 2960 undef $GRAB;
2884 $self->hide; 2961 $self->hide;
2885 2962
2886 $self->_emit ("popdown"); 2963 $self->_emit ("popdown");
2887 $self->{hover}[1]->() if $self->{hover}; 2964 $self->{hover}[1]->() if $self->{hover};
2965 } else {
2966 return 0
2967 }
2968
2888 } 2969 1
2889} 2970}
2890 2971
2891############################################################################# 2972#############################################################################
2892 2973
2893package CFClient::UI::Statusbox; 2974package CFClient::UI::Multiplexer;
2894 2975
2895our @ISA = CFClient::UI::VBox::; 2976our @ISA = CFClient::UI::Container::;
2896 2977
2897sub new { 2978sub new {
2898 my $class = shift; 2979 my $class = shift;
2899 2980
2900 $class->SUPER::new ( 2981 my $self = $class->SUPER::new (
2982 @_,
2983 );
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987
2988 $self
2989}
2990
2991sub add {
2992 my ($self, @widgets) = @_;
2993
2994 $self->SUPER::add (@widgets);
2995
2996 $self->{current} = $self->{children}[0]
2997 if @{ $self->{children} };
2998}
2999
3000sub set_current_page {
3001 my ($self, $page_or_widget) = @_;
3002
3003 my $widget = ref $page_or_widget
3004 ? $page_or_widget
3005 : $self->{children}[$page_or_widget];
3006
3007 $self->{current} = $widget;
3008 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3009
3010 $self->_emit (page_changed => $self->{current});
3011
3012 $self->realloc;
3013}
3014
3015sub visible_children {
3016 $_[0]{current}
3017}
3018
3019sub size_request {
3020 my ($self) = @_;
3021
3022 $self->{current}->size_request
3023}
3024
3025sub size_allocate {
3026 my ($self, $w, $h) = @_;
3027
3028 $self->{current}->configure (0, 0, $w, $h);
3029}
3030
3031sub _draw {
3032 my ($self) = @_;
3033
3034 $self->{current}->draw;
3035}
3036
3037#############################################################################
3038
3039package CFClient::UI::Notebook;
3040
3041our @ISA = CFClient::UI::VBox::;
3042
3043sub new {
3044 my $class = shift;
3045
3046 my $self = $class->SUPER::new (
3047 buttonbar => (new CFClient::UI::Buttonbar),
3048 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3049 # filter => # will be put between multiplexer and $self
3050 @_,
3051 );
3052
3053 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3054 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3055
3056 $self
3057}
3058
3059sub add {
3060 my ($self, $title, $widget, $tooltip) = @_;
3061
3062 Scalar::Util::weaken $self;
3063
3064 $self->{buttonbar}->add (new CFClient::UI::Button
3065 markup => $title,
3066 tooltip => $tooltip,
3067 on_activate => sub { $self->set_current_page ($widget) },
3068 );
3069
3070 $self->{multiplexer}->add ($widget);
3071}
3072
3073sub set_current_page {
3074 my ($self, $page) = @_;
3075
3076 $self->{multiplexer}->set_current_page ($page);
3077 $self->_emit (page_changed => $self->{multiplexer}{current});
3078}
3079
3080#############################################################################
3081
3082package CFClient::UI::Statusbox;
3083
3084our @ISA = CFClient::UI::VBox::;
3085
3086sub new {
3087 my $class = shift;
3088
3089 my $self = $class->SUPER::new (
2901 fontsize => 0.8, 3090 fontsize => 0.8,
2902 @_, 3091 @_,
2903 ) 3092 );
3093
3094 Scalar::Util::weaken (my $this = $self);
3095
3096 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3097
3098 $self
2904} 3099}
2905 3100
2906sub reorder { 3101sub reorder {
2907 my ($self) = @_; 3102 my ($self) = @_;
2908 my $NOW = time; 3103 my $NOW = Time::HiRes::time;
3104
3105 # freeze display when hovering over any label
3106 return if $CFClient::UI::TOOLTIP->{owner}
3107 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3108 values %{ $self->{item} };
2909 3109
2910 while (my ($k, $v) = each %{ $self->{item} }) { 3110 while (my ($k, $v) = each %{ $self->{item} }) {
2911 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3111 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2912 } 3112 }
2913 3113
… …
2916 my @items = sort { 3116 my @items = sort {
2917 $a->{pri} <=> $b->{pri} 3117 $a->{pri} <=> $b->{pri}
2918 or $b->{id} <=> $a->{id} 3118 or $b->{id} <=> $a->{id}
2919 } values %{ $self->{item} }; 3119 } values %{ $self->{item} };
2920 3120
3121 $self->{timer}->interval (1);
3122
2921 my $count = 10 + 1; 3123 my $count = 10 + 1;
2922 for my $item (@items) { 3124 for my $item (@items) {
2923 last unless --$count; 3125 last unless --$count;
2924 3126
2925 push @widgets, $item->{label} ||= do { 3127 my $label = $item->{label} ||= do {
2926 # TODO: doesn't handle markup well (read as: at all) 3128 # TODO: doesn't handle markup well (read as: at all)
2927 my $short = $item->{count} > 1 3129 my $short = $item->{count} > 1
2928 ? "<b>$item->{count} ×</b> $item->{text}" 3130 ? "<b>$item->{count} ×</b> $item->{text}"
2929 : $item->{text}; 3131 : $item->{text};
2930 3132
… …
2938 tooltip => $item->{tooltip}, 3140 tooltip => $item->{tooltip},
2939 tooltip_font => $::FONT_PROP, 3141 tooltip_font => $::FONT_PROP,
2940 tooltip_width => 0.67, 3142 tooltip_width => 0.67,
2941 fontsize => $item->{fontsize} || $self->{fontsize}, 3143 fontsize => $item->{fontsize} || $self->{fontsize},
2942 max_w => $::WIDTH * 0.44, 3144 max_w => $::WIDTH * 0.44,
2943 fg => $item->{fg}, 3145 fg => [@{ $item->{fg} }],
2944 can_events => 1, 3146 can_events => 1,
2945 can_hover => 1 3147 can_hover => 1
2946 }; 3148 };
3149
3150 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3151 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3152 $label->update;
3153 $label->set_max_size (undef, $label->{req_h} * $diff)
3154 if $diff < 1;
3155 $self->{timer}->interval (1/30);
3156 } else {
3157 $label->{fg}[3] = $item->{fg}[3] || 1;
3158 }
3159
3160 push @widgets, $label;
2947 } 3161 }
2948 3162
2949 $self->clear; 3163 $self->clear;
2950 $self->SUPER::add (reverse @widgets); 3164 $self->SUPER::add (reverse @widgets);
2951} 3165}
… …
2956 $text =~ s/^\s+//; 3170 $text =~ s/^\s+//;
2957 $text =~ s/\s+$//; 3171 $text =~ s/\s+$//;
2958 3172
2959 return unless $text; 3173 return unless $text;
2960 3174
2961 my $timeout = time + ((delete $arg{timeout}) || 60); 3175 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2962 3176
2963 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3177 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2964 3178
2965 if (my $item = $self->{item}{$group}) { 3179 if (my $item = $self->{item}{$group}) {
2966 if ($item->{text} eq $text) { 3180 if ($item->{text} eq $text) {
… …
2996 3210
2997 $self->reorder; 3211 $self->reorder;
2998 $self->SUPER::reconfigure; 3212 $self->SUPER::reconfigure;
2999} 3213}
3000 3214
3215sub DESTROY {
3216 my ($self) = @_;
3217
3218 $self->{timer}->cancel;
3219
3220 $self->SUPER::DESTROY;
3221}
3222
3001############################################################################# 3223#############################################################################
3002 3224
3003package CFClient::UI::Root; 3225package CFClient::UI::Inventory;
3004 3226
3005our @ISA = CFClient::UI::Container::; 3227our @ISA = CFClient::UI::ScrolledWindow::;
3006
3007use CFClient::OpenGL;
3008 3228
3009sub new { 3229sub new {
3010 my $class = shift; 3230 my $class = shift;
3011 3231
3012 $class->SUPER::new ( 3232 my $self = $class->SUPER::new (
3233 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3234 @_,
3235 );
3236
3237 $self
3238}
3239
3240sub set_items {
3241 my ($self, $items) = @_;
3242
3243 $self->{child}->clear;
3244 return unless $items;
3245
3246 my @items = sort {
3247 ($a->{type} <=> $b->{type})
3248 or ($a->{name} cmp $b->{name})
3249 } @$items;
3250
3251 $self->{real_items} = \@items;
3252
3253 my $row = 0;
3254 for my $item (@items) {
3255 CFClient::Item::update_widgets $item;
3256
3257 $self->{child}->add (0, $row, $item->{face_widget});
3258 $self->{child}->add (1, $row, $item->{desc_widget});
3259 $self->{child}->add (2, $row, $item->{weight_widget});
3260
3261 $row++;
3262 }
3263}
3264
3265#############################################################################
3266
3267package CFClient::UI::BindEditor;
3268
3269our @ISA = CFClient::UI::FancyFrame::;
3270
3271sub new {
3272 my $class = shift;
3273
3274 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3275
3276 $self->add (my $vb = new CFClient::UI::VBox);
3277
3278
3279 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3280 text => "start recording",
3281 tooltip => "Start/Stops recording of actions."
3282 ."All subsequent actions after the recording started will be captured."
3283 ."The actions are displayed after the record was stopped."
3284 ."To bind the action you have to click on the 'Bind' button",
3285 on_activate => sub {
3286 unless ($self->{recording}) {
3287 $self->start;
3288 } else {
3289 $self->stop;
3290 }
3291 });
3292
3293 $vb->add (new CFClient::UI::Label text => "Actions:");
3294 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3295
3296 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3297 $vb->add (my $hb = new CFClient::UI::HBox);
3298 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3299 $hb->add (new CFClient::UI::Button
3300 text => "bind",
3301 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3302 on_activate => sub {
3303 $self->ask_for_bind;
3304 });
3305
3306 $vb->add (my $hb = new CFClient::UI::HBox);
3307 $hb->add (new CFClient::UI::Button
3308 text => "ok",
3309 expand => 1,
3310 tooltip => "This closes the binding editor and saves the binding",
3311 on_activate => sub {
3312 $self->hide;
3313 $self->commit;
3314 });
3315
3316 $hb->add (new CFClient::UI::Button
3317 text => "cancel",
3318 expand => 1,
3319 tooltip => "This closes the binding editor without saving",
3320 on_activate => sub {
3321 $self->hide;
3322 $self->{binding_cancel}->()
3323 if $self->{binding_cancel};
3324 });
3325
3326 $self->update_binding_widgets;
3327
3328 $self
3329}
3330
3331sub commit {
3332 my ($self) = @_;
3333 my ($mod, $sym, $cmds) = $self->get_binding;
3334 if ($sym != 0 && @$cmds > 0) {
3335 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3336 ."'. Don't forget 'Save Config'!");
3337 $self->{binding_change}->($mod, $sym, $cmds)
3338 if $self->{binding_change};
3339 } else {
3340 $::STATUSBOX->add ("No action bound, no key or action specified!");
3341 $self->{binding_cancel}->()
3342 if $self->{binding_cancel};
3343 }
3344}
3345
3346sub start {
3347 my ($self) = @_;
3348
3349 $self->{rec_btn}->set_text ("stop recording");
3350 $self->{recording} = 1;
3351 $self->clear_command_list;
3352 $::CONN->start_record if $::CONN;
3353}
3354
3355sub stop {
3356 my ($self) = @_;
3357
3358 $self->{rec_btn}->set_text ("start recording");
3359 $self->{recording} = 0;
3360
3361 my $rec;
3362 $rec = $::CONN->stop_record if $::CONN;
3363 return unless ref $rec eq 'ARRAY';
3364 $self->set_command_list ($rec);
3365}
3366
3367
3368sub ask_for_bind_and_commit {
3369 my ($self) = @_;
3370 $self->ask_for_bind (1);
3371}
3372
3373sub ask_for_bind {
3374 my ($self, $commit) = @_;
3375
3376 CFClient::Binder::open_binding_dialog (sub {
3377 my ($mod, $sym) = @_;
3378 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3379 $self->update_binding_widgets;
3380 $self->commit if $commit;
3381 });
3382}
3383
3384# $mod and $sym are the modifiers and key symbol
3385# $cmds is a array ref of strings (the commands)
3386# $cb is the callback that is executed on OK
3387# $ccb is the callback that is executed on CANCEL and
3388# when the binding was unsuccessful on OK
3389sub set_binding {
3390 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3391
3392 $self->clear_command_list;
3393 $self->{recording} = 0;
3394 $self->{rec_btn}->set_text ("start recording");
3395
3396 $self->{binding} = [$mod, $sym];
3397 $self->{commands} = $cmds;
3398
3399 $self->{binding_change} = $cb;
3400 $self->{binding_cancel} = $ccb;
3401
3402 $self->update_binding_widgets;
3403}
3404
3405# this is a shortcut method that asks for a binding
3406# and then just binds it.
3407sub do_quick_binding {
3408 my ($self, $cmds) = @_;
3409 $self->set_binding (undef, undef, $cmds, sub {
3410 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3411 });
3412 $self->ask_for_bind (1);
3413}
3414
3415sub update_binding_widgets {
3416 my ($self) = @_;
3417 my ($mod, $sym, $cmds) = $self->get_binding;
3418 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3419 $self->set_command_list ($cmds);
3420}
3421
3422sub get_binding {
3423 my ($self) = @_;
3424 return (
3425 $self->{binding}->[0],
3426 $self->{binding}->[1],
3427 [ grep { defined $_ } @{$self->{commands}} ]
3428 );
3429}
3430
3431sub clear_command_list {
3432 my ($self) = @_;
3433 $self->{cmdbox}->clear ();
3434}
3435
3436sub set_command_list {
3437 my ($self, $cmds) = @_;
3438
3439 $self->{cmdbox}->clear ();
3440 $self->{commands} = $cmds;
3441
3442 my $idx = 0;
3443
3444 for (@$cmds) {
3445 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3446
3447 my $i = $idx;
3448 $hb->add (new CFClient::UI::Label text => $_);
3449 $hb->add (new CFClient::UI::Button
3450 text => "delete",
3451 tooltip => "Deletes the action from the record",
3452 on_activate => sub {
3453 $self->{cmdbox}->remove ($hb);
3454 $cmds->[$i] = undef;
3455 });
3456
3457
3458 $idx++
3459 }
3460}
3461
3462#############################################################################
3463
3464package CFClient::UI::SpellList;
3465
3466our @ISA = CFClient::UI::Table::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 binding => [],
3473 commands => [],
3474 @_,
3475 )
3476}
3477
3478# XXX: Do sorting? Argl...
3479sub add_spell {
3480 my ($self, $spell) = @_;
3481 $self->{spells}->{$spell->{name}} = $spell;
3482
3483 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3484 face => $spell->{face},
3485 can_hover => 1,
3486 can_events => 1,
3487 tooltip => $spell->{message});
3488
3489 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3490 text => $spell->{name},
3491 can_hover => 1,
3492 can_events => 1,
3493 tooltip => $spell->{message},
3494 expand => 1);
3495
3496 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3497 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3498 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3499 expand => 1);
3500
3501 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3502 text => "bind to key",
3503 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3504}
3505
3506sub rebuild_spell_list {
3507 my ($self) = @_;
3508 $self->{tbl_idx} = 0;
3509 $self->add_spell ($_) for values %{$self->{spells}};
3510}
3511
3512sub remove_spell {
3513 my ($self, $spell) = @_;
3514 delete $self->{spells}->{$spell->{name}};
3515 $self->rebuild_spell_list;
3516}
3517
3518#############################################################################
3519
3520package CFClient::UI::Root;
3521
3522our @ISA = CFClient::UI::Container::;
3523
3524use List::Util qw(min max);
3525
3526use CFClient::OpenGL;
3527
3528sub new {
3529 my $class = shift;
3530
3531 my $self = $class->SUPER::new (
3013 visible => 1, 3532 visible => 1,
3014 @_, 3533 @_,
3015 ) 3534 );
3016}
3017 3535
3018sub configure { 3536 Scalar::Util::weaken ($self->{root} = $self);
3019 my ($self, $x, $y, $w, $h) = @_;
3020 3537
3021 $self->{w} = $w; 3538 $self
3022 $self->{h} = $h;
3023}
3024
3025sub check_size {
3026 my ($self) = @_;
3027
3028 $self->size_allocate ($self->{w}, $self->{h})
3029 if $self->{w};
3030} 3539}
3031 3540
3032sub size_request { 3541sub size_request {
3033 my ($self) = @_; 3542 my ($self) = @_;
3034 3543
3035 ($self->{w}, $self->{h}) 3544 ($self->{w}, $self->{h})
3545}
3546
3547sub _to_pixel {
3548 my ($coord, $size, $max) = @_;
3549
3550 $coord =
3551 $coord eq "center" ? ($max - $size) * 0.5
3552 : $coord eq "max" ? $max
3553 : $coord;
3554
3555 $coord = 0 if $coord < 0;
3556 $coord = $max - $size if $coord > $max - $size;
3557
3558 int $coord + 0.5
3036} 3559}
3037 3560
3038sub size_allocate { 3561sub size_allocate {
3039 my ($self, $w, $h) = @_; 3562 my ($self, $w, $h) = @_;
3040 3563
3041 for my $child ($self->children) { 3564 for my $child ($self->children) {
3042 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3565 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3043 3566
3044 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3567 $X = $child->{force_x} if exists $child->{force_x};
3045 if exists $child->{req_x}; 3568 $Y = $child->{force_y} if exists $child->{force_y};
3046 3569
3047 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3570 $X = _to_pixel $X, $W, $self->{w};
3048 if exists $child->{req_y}; 3571 $Y = _to_pixel $Y, $H, $self->{h};
3049
3050 $X = $self->{user_x} if exists $self->{user_x};
3051 $Y = $self->{user_y} if exists $self->{user_y};
3052
3053 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3054 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3055 3572
3056 $child->configure ($X, $Y, $W, $H); 3573 $child->configure ($X, $Y, $W, $H);
3057 } 3574 }
3058} 3575}
3059 3576
… …
3070} 3587}
3071 3588
3072sub update { 3589sub update {
3073 my ($self) = @_; 3590 my ($self) = @_;
3074 3591
3075 $self->check_size;
3076 $::WANT_REFRESH++; 3592 $::WANT_REFRESH++;
3077} 3593}
3078 3594
3079sub add { 3595sub add {
3080 my ($self, @children) = @_; 3596 my ($self, @children) = @_;
3081 3597
3082 for (my @widgets = @children; my $w = pop @widgets; ) {
3083 push @widgets, $w->children;
3084 $w->{root} = $self;
3085 $w->{visible} = $self->{visible} + 1;
3086 }
3087
3088 for my $child (@children) {
3089 $child->{is_toplevel} = 1; 3598 $_->{is_toplevel} = 1
3090 3599 for @children;
3091 # integerise window positions
3092 $child->{x} = int $child->{x};
3093 $child->{y} = int $child->{y};
3094 }
3095 3600
3096 $self->SUPER::add (@children); 3601 $self->SUPER::add (@children);
3097} 3602}
3098 3603
3099sub remove { 3604sub remove {
3100 my ($self, @children) = @_; 3605 my ($self, @children) = @_;
3101 3606
3102 $self->SUPER::remove (@children); 3607 $self->SUPER::remove (@children);
3608
3609 delete $self->{is_toplevel}
3610 for @children;
3103 3611
3104 while (@children) { 3612 while (@children) {
3105 my $w = pop @children; 3613 my $w = pop @children;
3106 push @children, $w->children; 3614 push @children, $w->children;
3107 $w->set_invisible; 3615 $w->set_invisible;
… …
3126 while ($self->{refresh_hook}) { 3634 while ($self->{refresh_hook}) {
3127 $_->() 3635 $_->()
3128 for values %{delete $self->{refresh_hook}}; 3636 for values %{delete $self->{refresh_hook}};
3129 } 3637 }
3130 3638
3131 if ($self->{check_size}) { 3639 if ($self->{realloc}) {
3640 my %queue;
3132 my @queue; 3641 my @queue;
3642 my $widget;
3133 3643
3134 for (;;) { 3644 outer:
3135 if ($self->{check_size}) { 3645 while () {
3136 #TODO use array-of-depth approach 3646 if (my $realloc = delete $self->{realloc}) {
3647 for $widget (values %$realloc) {
3648 $widget->{visible} or next; # do not resize invisible widgets
3137 3649
3138 @queue = sort { $a->{visible} <=> $b->{visible} } 3650 $queue{$widget+0}++ and next; # duplicates are common
3139 @queue, values %{delete $self->{check_size}}; 3651
3652 push @{ $queue[$widget->{visible}] }, $widget;
3653 }
3140 } 3654 }
3141 3655
3656 while () {
3657 @queue or last outer;
3658
3142 my $widget = pop @queue || last; 3659 $widget = pop @{ $queue[-1] || [] }
3143 3660 and last;
3144 defined $widget->{visible} or last; # do not resize invisible widgets
3145
3146 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
3147 ? @$widget{qw(user_w user_h)}
3148 : $widget->size_request;
3149
3150 if (delete $widget->{force_alloc}
3151 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3152 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3153 3661
3662 pop @queue;
3663 }
3664
3665 delete $queue{$widget+0};
3666
3667 my ($w, $h) = $widget->size_request;
3668
3669 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3670 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3671
3672 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3673 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3674
3675 $w = $widget->{force_w} if exists $widget->{force_w};
3676 $h = $widget->{force_h} if exists $widget->{force_h};
3677
3678 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3679 || delete $widget->{force_realloc}) {
3154 $widget->{req_w} = $w; 3680 $widget->{req_w} = $w;
3155 $widget->{req_h} = $h; 3681 $widget->{req_h} = $h;
3156 3682
3157 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3683 $self->{size_alloc}{$widget+0} = $widget;
3158 3684
3159 $widget->{parent}->check_size
3160 if $widget->{parent}; 3685 if (my $parent = $widget->{parent}) {
3686 $self->{realloc}{$parent+0} = $parent
3687 unless $queue{$parent+0};
3688
3689 $parent->{force_size_alloc} = 1;
3690 $self->{size_alloc}{$parent+0} = $parent;
3691 }
3161 } 3692 }
3693
3694 delete $self->{realloc}{$widget+0};
3162 } 3695 }
3163 } 3696 }
3164 3697
3165 while ($self->{size_alloc}) { 3698 while (my $size_alloc = delete $self->{size_alloc}) {
3166 for (values %{delete $self->{size_alloc}}) { 3699 my @queue = sort { $b->{visible} <=> $a->{visible} }
3167 my ($widget, $w, $h) = @$_; 3700 values %$size_alloc;
3701
3702 while () {
3703 my $widget = pop @queue || last;
3704
3705 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3168 3706
3169 $w = 0 if $w < 0; 3707 $w = 0 if $w < 0;
3170 $h = 0 if $h < 0; 3708 $h = 0 if $h < 0;
3171 3709
3710 $w = int $w + 0.5;
3711 $h = int $h + 0.5;
3712
3713 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3714 $widget->{old_w} = $widget->{w};
3715 $widget->{old_h} = $widget->{h};
3716
3172 $widget->{w} = $w; 3717 $widget->{w} = $w;
3173 $widget->{h} = $h; 3718 $widget->{h} = $h;
3719
3174 $widget->emit (size_allocate => $w, $h); 3720 $widget->emit (size_allocate => $w, $h);
3721 }
3175 } 3722 }
3176 } 3723 }
3177 3724
3178 while ($self->{post_alloc_hook}) { 3725 while ($self->{post_alloc_hook}) {
3179 $_->() 3726 $_->()
3180 for values %{delete $self->{post_alloc_hook}}; 3727 for values %{delete $self->{post_alloc_hook}};
3181 } 3728 }
3729
3182 3730
3183 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3731 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3184 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3732 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3185 glClear GL_COLOR_BUFFER_BIT; 3733 glClear GL_COLOR_BUFFER_BIT;
3186 3734
… …
3188 glLoadIdentity; 3736 glLoadIdentity;
3189 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3737 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3190 glMatrixMode GL_MODELVIEW; 3738 glMatrixMode GL_MODELVIEW;
3191 glLoadIdentity; 3739 glLoadIdentity;
3192 3740
3741 {
3742 package CFClient::UI::Base;
3743
3744 ($draw_x, $draw_y, $draw_w, $draw_h) =
3745 (0, 0, $self->{w}, $self->{h});
3746 }
3747
3193 $self->_draw; 3748 $self->_draw;
3194} 3749}
3195 3750
3196############################################################################# 3751#############################################################################
3197 3752

Diff Legend

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