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.235 by root, Thu May 25 16:35:42 2006 UTC vs.
Revision 1.287 by root, Mon Jun 5 05:31:13 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;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 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;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 75 $FOCUS->emit (key_down => $_[0])
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
… …
94 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 116 $grab->update if $grab;
97 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
98 118
99 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
100 } 120 }
101} 121}
102 122
103sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
104 my ($ev) = @_; 124 my ($ev) = @_;
… …
110 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
111 131
112 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
113 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
114 134
115 check_tooltip; 135 $TOOLTIP_WATCHER->start;
116 } 136 }
117 137
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y)) 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 139 if $HOVER;
120} 140}
… …
152sub rescale_widgets { 172sub rescale_widgets {
153 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
154 174
155 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
156 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
157 $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.]+$/;
158 $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};
159 $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};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $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.]+$/;
162 $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};
163 $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};
164 $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
165 } 190 }
166 } 191 }
167 192
168 reconfigure_widgets; 193 reconfigure_widgets;
169} 194}
… …
178 203
179sub new { 204sub new {
180 my $class = shift; 205 my $class = shift;
181 206
182 my $self = bless { 207 my $self = bless {
183 x => 0, 208 x => "center",
184 y => 0, 209 y => "center",
185 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
186 can_events => 1, 213 can_events => 1,
187 @_ 214 @_
188 }, $class; 215 }, $class;
189 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
190 for (keys %$self) { 219 for (keys %$self) {
191 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
193 } 222 }
194 } 223 }
195 224
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
197 236
198 $self 237 $self
199} 238}
200 239
201sub destroy { 240sub destroy {
… …
205 %$self = (); 244 %$self = ();
206} 245}
207 246
208sub show { 247sub show {
209 my ($self) = @_; 248 my ($self) = @_;
249
210 return if $self->{parent}; 250 return if $self->{parent};
211 251
212 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
213} 253}
214 254
215sub show_centered { 255sub set_visible {
216 my ($self) = @_; 256 my ($self) = @_;
257
217 return if $self->{parent}; 258 return if $self->{visible};
218 259
219 $self->show; 260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
220 262
221 $CFClient::UI::ROOT->on_post_alloc ( 263 $self->emit (visibility_change => 1);
222 "centered $self" => sub { 264
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 265 $self->realloc if !exists $self->{req_w};
224 }, 266
225 ); 267 $_->set_visible for $self->children;
226} 268}
227 269
228sub set_invisible { 270sub set_invisible {
229 my ($self) = @_; 271 my ($self) = @_;
230 272
231 # broken show/hide model 273 return unless $self->{visible};
232 274
275 $_->set_invisible for $self->children;
276
277 delete $self->{root};
233 delete $self->{visible}; 278 delete $self->{visible};
234 279
235 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
237 282
238 CFClient::UI::check_tooltip 283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 284 if $TOOLTIP->{owner} == $self;
240 285
241 $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;
242} 306}
243 307
244sub hide { 308sub hide {
245 my ($self) = @_; 309 my ($self) = @_;
246 310
… …
248 312
249 $self->{parent}->remove ($self) 313 $self->{parent}->remove ($self)
250 if $self->{parent}; 314 if $self->{parent};
251} 315}
252 316
253sub move { 317sub move_abs {
254 my ($self, $x, $y, $z) = @_; 318 my ($self, $x, $y, $z) = @_;
255 319
256 $self->{x} = int $x; 320 $self->{x} = List::Util::max 0, int $x;
257 $self->{y} = int $y; 321 $self->{y} = List::Util::max 0, int $y;
258 $self->{z} = $z if defined $z; 322 $self->{z} = $z if defined $z;
259 323
260 $self->update; 324 $self->update;
261} 325}
262 326
263sub set_size { 327sub set_size {
264 my ($self, $w, $h) = @_; 328 my ($self, $w, $h) = @_;
265 329
266 $self->{user_w} = $w; 330 $self->{force_w} = $w;
267 $self->{user_h} = $h; 331 $self->{force_h} = $h;
268 332
269 $self->check_size; 333 $self->realloc;
270} 334}
271 335
272sub size_request { 336sub size_request {
273 require Carp; 337 require Carp;
274 Carp::confess "size_request is abstract"; 338 Carp::confess "size_request is abstract";
… …
276 340
277sub configure { 341sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 342 my ($self, $x, $y, $w, $h) = @_;
279 343
280 if ($self->{aspect}) { 344 if ($self->{aspect}) {
345 my ($ow, $oh) = ($w, $h);
346
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 347 $w = List::Util::min $w, int $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 348 $h = List::Util::min $h, int $w / $self->{aspect};
283 349
284 # use alignment to adjust x, y 350 # use alignment to adjust x, y
285 351
286 $x += int +($w - $w2) * 0.5; 352 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 353 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 354 }
291 355
292 if ($self->{x} != $x || $self->{y} != $y) { 356 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 357 $self->{x} = $x;
294 $self->{y} = $y; 358 $self->{y} = $y;
295 $self->update; 359 $self->update;
296 } 360 }
297 361
298 if ($self->{w} != $w || $self->{h} != $h) { 362 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $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;
300 } 369 }
301} 370}
302 371
303sub size_allocate { 372sub size_allocate {
304 # nothing to be done 373 # nothing to be done
305} 374}
306 375
307sub reconfigure {
308 my ($self) = @_;
309
310 $self->check_size (1);
311 $self->update;
312}
313
314sub children { 376sub children {
377 # nop
378}
379
380sub visible_children {
381 $_[0]->children
315} 382}
316 383
317sub set_max_size { 384sub set_max_size {
318 my ($self, $w, $h) = @_; 385 my ($self, $w, $h) = @_;
319 386
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 387 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 388 $self->{max_h} = int $h if defined $h;
389
390 $self->realloc;
322} 391}
323 392
324sub set_tooltip { 393sub set_tooltip {
325 my ($self, $tooltip) = @_; 394 my ($self, $tooltip) = @_;
326 395
… …
331 400
332 $self->{tooltip} = $tooltip; 401 $self->{tooltip} = $tooltip;
333 402
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 403 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 404 delete $CFClient::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 405 $CFClient::UI::TOOLTIP_WATCHER->cb->();
337 } 406 }
338} 407}
339 408
340# translate global coordinates to local coordinate system 409# translate global coordinates to local coordinate system
341sub coord2local { 410sub coord2local {
… …
378 447
379 $::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
380 unless $FOCUS; 449 unless $FOCUS;
381} 450}
382 451
383sub mouse_motion { } 452sub mouse_motion { 0 }
384sub button_up { } 453sub button_up { 0 }
385sub key_down { } 454sub key_down { 0 }
386sub key_up { } 455sub key_up { 0 }
387 456
388sub button_down { 457sub button_down {
389 my ($self, $ev, $x, $y) = @_; 458 my ($self, $ev, $x, $y) = @_;
390 459
391 $self->focus_in; 460 $self->focus_in;
392}
393 461
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 462 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 463}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 464
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 465sub find_widget {
398sub 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
399 538
400sub draw { 539sub draw {
401 my ($self) = @_; 540 my ($self) = @_;
402 541
403 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);
404 553
405 glPushMatrix; 554 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0; 555 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409 556
410 if ($self == $HOVER && $self->{can_hover}) { 557 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2; 558 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
414 glEnable GL_BLEND; 559 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 560 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS; 561 glBegin GL_QUADS;
417 glVertex $x , $y; 562 glVertex 0 , 0;
418 glVertex $x + $self->{w}, $y; 563 glVertex $self->{w}, 0;
419 glVertex $x + $self->{w}, $y + $self->{h}; 564 glVertex $self->{w}, $self->{h};
420 glVertex $x , $y + $self->{h}; 565 glVertex 0 , $self->{h};
421 glEnd; 566 glEnd;
422 glDisable GL_BLEND; 567 glDisable GL_BLEND;
423 } 568 }
424 569
425 if ($ENV{PCLIENT_DEBUG}) { 570 if ($ENV{CFPLUS_DEBUG} & 1) {
426 glPushMatrix; 571 glPushMatrix;
427 glColor 1, 1, 0, 1; 572 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 573 glTranslate 0.375, 0.375;
429 glBegin GL_LINE_LOOP; 574 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0; 575 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0; 576 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1; 577 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1; 578 glVertex 0 , $self->{h} - 1;
434 glEnd; 579 glEnd;
435 glPopMatrix; 580 glPopMatrix;
436 #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;
437 } 582 }
583
584 $self->_draw;
585 glPopMatrix;
438} 586}
439 587
440sub _draw { 588sub _draw {
441 my ($self) = @_; 589 my ($self) = @_;
442 590
443 warn "no draw defined for $self\n"; 591 warn "no draw defined for $self\n";
444}
445
446sub find_widget {
447 my ($self, $x, $y) = @_;
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457
458sub set_parent {
459 my ($self, $parent) = @_;
460
461 Scalar::Util::weaken ($self->{parent} = $parent);
462
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468}
469
470sub check_size {
471 my ($self, $forced) = @_;
472
473 $self->{force_alloc} = 1 if $forced;
474 $CFClient::UI::ROOT->{check_size}{$self} = $self;
475}
476
477sub update {
478 my ($self) = @_;
479
480 $self->{parent}->update
481 if $self->{parent};
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} 592}
502 593
503sub DESTROY { 594sub DESTROY {
504 my ($self) = @_; 595 my ($self) = @_;
505 596
… …
537 628
538 if ($color && (@$color < 4 || $color->[3])) { 629 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 630 my ($w, $h) = @$self{qw(w h)};
540 631
541 glEnable GL_BLEND; 632 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 633 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 634 glColor_premultiply @$color;
544 635
545 glBegin GL_QUADS; 636 glBegin GL_QUADS;
546 glVertex 0 , 0; 637 glVertex 0 , 0;
547 glVertex 0 , $h; 638 glVertex 0 , $h;
548 glVertex $w, $h; 639 glVertex $w, $h;
… …
563 my ($class, %arg) = @_; 654 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 655 $class->SUPER::new (can_events => 0, %arg);
565} 656}
566 657
567sub size_request { 658sub size_request {
568 (0, 0) 659 my ($self) = @_;
660
661 ($self->{w} + 0, $self->{h} + 0)
569} 662}
570 663
571sub draw { } 664sub draw { }
572 665
573############################################################################# 666#############################################################################
… …
577our @ISA = CFClient::UI::Base::; 670our @ISA = CFClient::UI::Base::;
578 671
579sub new { 672sub new {
580 my ($class, %arg) = @_; 673 my ($class, %arg) = @_;
581 674
582 my $children = delete $arg{children} || []; 675 my $children = delete $arg{children};
583 676
584 my $self = $class->SUPER::new ( 677 my $self = $class->SUPER::new (
585 children => [], 678 children => [],
586 can_events => 0, 679 can_events => 0,
587 %arg, 680 %arg,
588 ); 681 );
682
589 $self->add ($_) for @$children; 683 $self->add (@$children)
684 if $children;
590 685
591 $self 686 $self
592} 687}
593 688
594sub add { 689sub add {
… …
602 $self->{children} = [ 697 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 698 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 699 @{$self->{children}}, @widgets
605 ]; 700 ];
606 701
607 $self->check_size (1); 702 $self->realloc;
608 $self->update;
609} 703}
610 704
611sub children { 705sub children {
612 @{ $_[0]{children} } 706 @{ $_[0]{children} }
613} 707}
… …
618 delete $child->{parent}; 712 delete $child->{parent};
619 $child->hide; 713 $child->hide;
620 714
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 715 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
622 716
623 $self->check_size; 717 $self->realloc;
624 $self->update;
625} 718}
626 719
627sub clear { 720sub clear {
628 my ($self) = @_; 721 my ($self) = @_;
629 722
… …
633 for (@$children) { 726 for (@$children) {
634 delete $_->{parent}; 727 delete $_->{parent};
635 $_->hide; 728 $_->hide;
636 } 729 }
637 730
638 $self->check_size; 731 $self->realloc;
639 $self->update;
640} 732}
641 733
642sub find_widget { 734sub find_widget {
643 my ($self, $x, $y) = @_; 735 my ($self, $x, $y) = @_;
644 736
645 $x -= $self->{x}; 737 $x -= $self->{x};
646 $y -= $self->{y}; 738 $y -= $self->{y};
647 739
648 my $res; 740 my $res;
649 741
650 for (reverse @{ $self->{children} }) { 742 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 743 $res = $_->find_widget ($x, $y)
652 and return $res; 744 and return $res;
653 } 745 }
654 746
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 747 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
704 $self->{children}[0]->configure (0, 0, $w, $h); 796 $self->{children}[0]->configure (0, 0, $w, $h);
705} 797}
706 798
707############################################################################# 799#############################################################################
708 800
801# back-buffered drawing area
802
709package CFClient::UI::Window; 803package CFClient::UI::Window;
710 804
711our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
712 806
713use CFClient::OpenGL; 807use CFClient::OpenGL;
… …
731 $self->SUPER::size_allocate ($w, $h); 825 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 826 $self->update;
733} 827}
734 828
735sub _render { 829sub _render {
830 my ($self) = @_;
831
736 $_[0]{children}[0]->draw; 832 $self->{children}[0]->draw;
737} 833}
738 834
739sub render_child { 835sub render_child {
740 my ($self) = @_; 836 my ($self) = @_;
741 837
742 $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 {
743 glClearColor 0, 0, 0, 0; 839 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 840 glClear GL_COLOR_BUFFER_BIT;
745 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
746 $self->_render; 849 $self->_render;
747 }; 850 };
748} 851}
749 852
750sub _draw { 853sub _draw {
751 my ($self) = @_; 854 my ($self) = @_;
752 855
753 my ($w, $h) = ($self->w, $self->h); 856 my ($w, $h) = @$self{qw(w h)};
754 857
755 my $tex = $self->{texture} 858 my $tex = $self->{texture}
756 or return; 859 or return;
757 860
758 glEnable GL_TEXTURE_2D; 861 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 862 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 863 glColor 0, 0, 0, 1;
761 864
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 865 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
763 866
764 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
765} 868}
… …
781} 884}
782 885
783sub size_request { 886sub size_request {
784 my ($self) = @_; 887 my ($self) = @_;
785 888
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 890
788 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
789} 895}
790 896
791sub size_allocate { 897sub size_allocate {
792 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
793 899
900 my $child = $self->child;
901
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 904
797 $self->child->configure (0, 0, $w, $h); 905 $self->child->configure (0, 0, $w, $h);
798 $self->update; 906 $self->update;
799} 907}
800 908
… …
836} 944}
837 945
838sub _render { 946sub _render {
839 my ($self) = @_; 947 my ($self) = @_;
840 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
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 953
843 $self->SUPER::_render; 954 $self->SUPER::_render;
844} 955}
845 956
… …
848package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
849 960
850our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
851 962
852sub new { 963sub new {
853 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
854 967
855 my $self; 968 my $self;
856 969
857 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
858 vertical => 1, 971 vertical => 1,
859 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 973 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
862 }, 975 },
863 ; 976 ;
864 977
865 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
867 slider => $slider, 980 slider => $slider,
868 @_, 981 %arg,
869 ); 982 );
870 983
871 $self->{vp}->add ($self->{scrolled});
872 $self->add ($self->{vp});
873 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
874 986
875 $self 987 $self
988}
989
990sub add {
991 my ($self, $widget) = @_;
992
993 $self->{vp}->add ($self->{child} = $widget);
994}
995
996sub update {
997 my ($self) = @_;
998
999 $self->SUPER::update;
1000
1001 # todo: overwrite size_allocate of child
1002 my $child = $self->{vp}->child;
1003 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
876} 1004}
877 1005
878sub size_allocate { 1006sub size_allocate {
879 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
880 1008
… …
909 1037
910 if ($self->{bg}) { 1038 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
912 1040
913 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
916 1044
917 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
918 glVertex 0 , 0; 1046 glVertex 0 , 0;
919 glVertex 0 , $h; 1047 glVertex 0 , $h;
920 glVertex $w, $h; 1048 glVertex $w, $h;
… …
933 1061
934our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
935 1063
936use CFClient::OpenGL; 1064use CFClient::OpenGL;
937 1065
938my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 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);
941 1073
942sub new { 1074sub new {
943 my $class = shift; 1075 my ($class, %arg) = @_;
944 1076
945 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
946 1078
947 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
949 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
950 border => 0.6, 1082 border => 0.6,
951 is_toplevel => 1,
952 can_events => 1, 1083 can_events => 1,
953 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
954 ); 1087 );
955 1088
956 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
957 align => 0, 1090 align => 0,
958 valign => 1, 1091 valign => 1,
959 text => $self->{title}, 1092 text => $title,
960 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
961 1095
962 $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};
963} 1104}
964 1105
965sub border { 1106sub border {
966 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
967} 1108}
968 1109
969sub size_request { 1110sub size_request {
970 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
971 1115
972 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
973 1117
974 ( 1118 (
975 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
978} 1122}
979 1123
980sub size_allocate { 1124sub size_allocate {
981 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
982 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
983 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
984 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
985 1137
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
987 if $self->{title};
988
989 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
990} 1139}
991 1140
992sub button_down { 1141sub button_down {
993 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
994 1143
… …
1010 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
1011 1160
1012 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
1014 1163
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1168 $self->realloc;
1019 }; 1169 };
1020 1170
1021 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1175 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
1027 1177
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1179
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
1033 } 1188 1
1034} 1189}
1035 1190
1036sub button_up { 1191sub button_up {
1037 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1038 1193
1039 delete $self->{motion}; 1194 !!delete $self->{motion}
1040} 1195}
1041 1196
1042sub mouse_motion { 1197sub mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1044 1199
1045 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1046} 1203}
1047 1204
1048sub _draw { 1205sub _draw {
1049 my ($self) = @_; 1206 my ($self) = @_;
1050 1207
1208 my $child = $self->{children}[0];
1209
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1212
1054 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1215
1057 my $border = $self->border; 1216 my $border = $self->border;
1058 1217
1059 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1064 1223
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1067 1226
1068 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1232 }
1079 1233
1080 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1081 1235
1082 $self->{title}->draw if $self->{title};
1083
1084 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1085} 1242}
1086 1243
1087############################################################################# 1244#############################################################################
1088 1245
1089package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1101 col_expand => [], 1258 col_expand => [],
1102 @_, 1259 @_,
1103 ) 1260 )
1104} 1261}
1105 1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1265}
1266
1106sub add { 1267sub add {
1107 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1108 1269
1109 $child->set_parent ($self); 1270 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1111 1272
1112 $child->check_size; 1273 $self->realloc;
1113} 1274}
1114 1275
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal? 1276# TODO: move to container class maybe? send children a signal on removal?
1120sub clear { 1277sub clear {
1121 my ($self) = @_; 1278 my ($self) = @_;
1122 1279
1123 my @children = $self->children; 1280 my @children = $self->children;
1124 delete $self->{children}; 1281 delete $self->{children};
… …
1126 for (@children) { 1283 for (@children) {
1127 delete $_->{parent}; 1284 delete $_->{parent};
1128 $_->hide; 1285 $_->hide;
1129 } 1286 }
1130 1287
1131 $self->update; 1288 $self->realloc;
1132} 1289}
1133 1290
1134sub get_wh { 1291sub get_wh {
1135 my ($self) = @_; 1292 my ($self) = @_;
1136 1293
… …
1167sub size_allocate { 1324sub size_allocate {
1168 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1169 1326
1170 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1171 1328
1172 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1174 1331
1175 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1176 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1232 } 1389 }
1233} 1390}
1234 1391
1235############################################################################# 1392#############################################################################
1236 1393
1237package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1238
1239# TODO: wrap into common Box base class
1240 1395
1241our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1242 1397
1243sub size_request { 1398sub size_request {
1244 my ($self) = @_; 1399 my ($self) = @_;
1245 1400
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1247 1402 ? (
1248 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1249 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1250 (List::Util::max map $_->[1], @alloc), 1405 )
1251 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1252} 1410}
1253 1411
1254sub size_allocate { 1412sub size_allocate {
1255 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1256 1414
1257 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1258
1259 my $children = $self->{children}; 1416 my $children = $self->{children};
1260 1417
1261 my @h = map $_->{req_w}, @$children; 1418 my @req;
1262 1419
1263 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1264 1421 @req = ($space / (@$children || 1)) x @$children;
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } 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 {
1269 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1270 $exp ||= 1;
1271 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1272 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 } 1436 }
1279 } 1437 }
1280 1438
1281 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1282 1440
1283 my $y = 0; 1441 my $pos = 0;
1284 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1287 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1288 1445
1289 $y += $h; 1446 $pos += $alloc;
1290 } 1447 }
1291 1448
1292 1 1449 1
1293} 1450}
1294 1451
1295############################################################################# 1452#############################################################################
1296 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
1297package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1298 1470
1299# TODO: wrap into common Box base class
1300
1301our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1302 1472
1303sub size_request { 1473sub new {
1304 my ($self) = @_; 1474 my $class = shift;
1305 1475
1306 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1307 1477 vertical => 1,
1308 ( 1478 @_,
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1479 )
1312}
1313
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351} 1480}
1352 1481
1353############################################################################# 1482#############################################################################
1354 1483
1355package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1372 ellipsise => 3, # end 1501 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1374 fontsize => 1, 1503 fontsize => 1,
1375 align => -1, 1504 align => -1,
1376 valign => -1, 1505 valign => -1,
1377 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1378 can_events => 0, 1508 can_events => 0,
1379 %arg 1509 %arg
1380 ); 1510 );
1381 1511
1382 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1409 1539
1410 delete $self->{texture}; 1540 delete $self->{texture};
1411 $self->SUPER::update; 1541 $self->SUPER::update;
1412} 1542}
1413 1543
1544sub realloc {
1545 my ($self) = @_;
1546
1547 delete $self->{ox};
1548 $self->SUPER::realloc;
1549}
1550
1414sub set_text { 1551sub set_text {
1415 my ($self, $text) = @_; 1552 my ($self, $text) = @_;
1416 1553
1417 return if $self->{text} eq "T$text"; 1554 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1555 $self->{text} = "T$text";
1419 1556
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1557 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1558 $self->{layout}->set_text ($text);
1559 delete $self->{req_h};
1422 1560
1561 $self->realloc;
1423 $self->update; 1562 $self->update;
1424 $self->check_size;
1425} 1563}
1426 1564
1427sub set_markup { 1565sub set_markup {
1428 my ($self, $markup) = @_; 1566 my ($self, $markup) = @_;
1429 1567
… …
1432 1570
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1571 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1572
1435 $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;
1436 $self->{layout}->set_markup ($markup); 1574 $self->{layout}->set_markup ($markup);
1575 delete $self->{req_h};
1437 1576
1577 $self->realloc;
1438 $self->update; 1578 $self->update;
1439 $self->check_size;
1440} 1579}
1441 1580
1442sub size_request { 1581sub size_request {
1443 my ($self) = @_; 1582 my ($self) = @_;
1444 1583
1584 if (exists $self->{req_h}) {
1585 @$self{qw(req_w req_h)}
1586 } else {
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1587 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1588 $self->{layout}->set_width ($self->{max_w} || -1);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1589 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1590 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1591 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1592
1451 my ($w, $h) = $self->{layout}->size; 1593 my ($w, $h) = $self->{layout}->size;
1452 1594
1453 if (exists $self->{template}) { 1595 if (exists $self->{template}) {
1454 $self->{template}->set_font ($self->{font}) if $self->{font}; 1596 $self->{template}->set_font ($self->{font}) if $self->{font};
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1597 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 1598
1457 my ($w2, $h2) = $self->{template}->size; 1599 my ($w2, $h2) = $self->{template}->size;
1458 1600
1459 $w = List::Util::max $w, $w2; 1601 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 1602 $h = List::Util::max $h, $h2;
1461 } 1603 }
1462 1604
1605 ($w, $h)
1463 ( 1606 }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 1607}
1468 1608
1469sub size_allocate { 1609sub size_allocate {
1470 my ($self, $w, $h) = @_; 1610 my ($self, $w, $h) = @_;
1471 1611
1612 delete $self->{ox};
1613
1472 delete $self->{texture}; 1614 delete $self->{texture}
1615 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1473} 1616}
1474 1617
1475sub set_fontsize { 1618sub set_fontsize {
1476 my ($self, $fontsize) = @_; 1619 my ($self, $fontsize) = @_;
1477 1620
1478 $self->{fontsize} = $fontsize; 1621 $self->{fontsize} = $fontsize;
1479 delete $self->{texture}; 1622 delete $self->{texture};
1480 1623
1481 $self->update; 1624 $self->realloc;
1482 $self->check_size;
1483} 1625}
1484 1626
1485sub _draw { 1627sub _draw {
1486 my ($self) = @_; 1628 my ($self) = @_;
1487 1629
… …
1493 $self->{layout}->set_width ($self->{w}); 1635 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1636 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1637 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1638 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 1639
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1640 new_from_layout CFClient::Texture $self->{layout}
1641 };
1499 1642
1643 unless (exists $self->{ox}) {
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1644 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1645 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1502 : ($self->{w} - $tex->{w}) * 0.5); 1646 : ($self->{w} - $tex->{w}) * 0.5);
1503 1647
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1648 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1649 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1506 : ($self->{h} - $tex->{h}) * 0.5); 1650 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 1651 };
1510 1652
1511 glEnable GL_TEXTURE_2D; 1653 glEnable GL_TEXTURE_2D;
1512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1513 1654
1514 if ($tex->{format} == GL_ALPHA) { 1655 if ($tex->{format} == GL_ALPHA) {
1656 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1515 glColor @{$self->{fg}}; 1657 glColor @{$self->{fg}};
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1658 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else { 1659 } else {
1660 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1661 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 } 1662 }
1520 1663
1521 glDisable GL_TEXTURE_2D; 1664 glDisable GL_TEXTURE_2D;
1522} 1665}
… …
1551 1694
1552 delete $self->{cur_h}; 1695 delete $self->{cur_h};
1553 1696
1554 return if $self->{text} eq $text; 1697 return if $self->{text} eq $text;
1555 1698
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 1699 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 1700 $self->{text} = $text;
1560 1701
1561 $text =~ s/./*/g if $self->{hidden}; 1702 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 1703 $self->{layout}->set_text ("$text ");
1704 delete $self->{req_h};
1563 1705
1564 $self->_emit (changed => $self->{text}); 1706 $self->_emit (changed => $self->{text});
1707
1708 $self->realloc;
1709 $self->update;
1565} 1710}
1566 1711
1567sub set_text { 1712sub set_text {
1568 my ($self, $text) = @_; 1713 my ($self, $text) = @_;
1569 1714
1570 $self->{cursor} = length $text; 1715 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 1716 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 1717}
1575 1718
1576sub get_text { 1719sub get_text {
1577 $_[0]{text} 1720 $_[0]{text}
1578} 1721}
… …
1608 $self->{cursor} = length $text; 1751 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 1752 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 1753 $self->_emit ('escape');
1611 } elsif ($uni) { 1754 } elsif ($uni) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 1755 substr $text, $self->{cursor}++, 0, chr $uni;
1756 } else {
1757 return 0;
1613 } 1758 }
1614 1759
1615 $self->_set_text ($text); 1760 $self->_set_text ($text);
1616 $self->update; 1761
1617 $self->check_size; 1762 $self->realloc;
1763
1764 1
1618} 1765}
1619 1766
1620sub focus_in { 1767sub focus_in {
1621 my ($self) = @_; 1768 my ($self) = @_;
1622 1769
… …
1637 utf8::encode $text; 1784 utf8::encode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 1785 $self->{cursor} = length substr $text, 0, $idx;
1639 1786
1640 $self->_set_text ($self->{text}); 1787 $self->_set_text ($self->{text});
1641 $self->update; 1788 $self->update;
1789
1790 1
1642} 1791}
1643 1792
1644sub mouse_motion { 1793sub mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 1794 my ($self, $ev, $x, $y) = @_;
1646# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1795# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1796
1797 0
1647} 1798}
1648 1799
1649sub _draw { 1800sub _draw {
1650 my ($self) = @_; 1801 my ($self) = @_;
1651 1802
1652 local $self->{fg} = $self->{fg}; 1803 local $self->{fg} = $self->{fg};
1653 1804
1654 if ($FOCUS == $self) { 1805 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 1806 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 1807 $self->{fg} = $self->{active_fg};
1657 } else { 1808 } else {
1658 glColor @{$self->{bg}}; 1809 glColor_premultiply @{$self->{bg}};
1659 } 1810 }
1660 1811
1661 glEnable GL_BLEND; 1812 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1813 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS; 1814 glBegin GL_QUADS;
1664 glVertex 0 , 0; 1815 glVertex 0 , 0;
1665 glVertex 0 , $self->{h}; 1816 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 1817 glVertex $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0; 1818 glVertex $self->{w}, 0;
… …
1728 } else { 1879 } else {
1729 $self->set_text ($self->{history_saveback}); 1880 $self->set_text ($self->{history_saveback});
1730 } 1881 }
1731 1882
1732 } else { 1883 } else {
1733 $self->SUPER::key_down ($ev); 1884 return $self->SUPER::key_down ($ev)
1885 }
1886
1734 } 1887 1
1735
1736} 1888}
1737 1889
1738############################################################################# 1890#############################################################################
1739 1891
1740package CFClient::UI::Button; 1892package CFClient::UI::Button;
… …
1749 1901
1750sub new { 1902sub new {
1751 my $class = shift; 1903 my $class = shift;
1752 1904
1753 $class->SUPER::new ( 1905 $class->SUPER::new (
1754 padding => 4, 1906 padding_x => 4,
1907 padding_y => 4,
1755 fg => [1, 1, 1], 1908 fg => [1, 1, 1],
1756 active_fg => [0, 0, 1], 1909 active_fg => [0, 0, 1],
1757 can_hover => 1, 1910 can_hover => 1,
1758 align => 0, 1911 align => 0,
1759 valign => 0, 1912 valign => 0,
… …
1768 my ($self, $ev, $x, $y) = @_; 1921 my ($self, $ev, $x, $y) = @_;
1769 1922
1770 $self->emit ("activate") 1923 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 1924 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 1925 && $y >= 0 && $y < $self->{h};
1926
1927 1
1773} 1928}
1774 1929
1775sub _draw { 1930sub _draw {
1776 my ($self) = @_; 1931 my ($self) = @_;
1777 1932
1778 local $self->{fg} = $self->{fg}; 1933 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 1934
1784 glEnable GL_TEXTURE_2D; 1935 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1936 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 1937 glColor 0, 0, 0, 1;
1787 1938
… …
1806 1957
1807sub new { 1958sub new {
1808 my $class = shift; 1959 my $class = shift;
1809 1960
1810 $class->SUPER::new ( 1961 $class->SUPER::new (
1811 padding => 2, 1962 padding_x => 2,
1963 padding_y => 2,
1812 fg => [1, 1, 1], 1964 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 1965 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 1966 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 1967 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 1968 state => 0,
… …
1820} 1972}
1821 1973
1822sub size_request { 1974sub size_request {
1823 my ($self) = @_; 1975 my ($self) = @_;
1824 1976
1825 ($self->{padding} * 2 + 6) x 2 1977 (6) x 2
1826} 1978}
1827 1979
1828sub button_down { 1980sub button_down {
1829 my ($self, $ev, $x, $y) = @_; 1981 my ($self, $ev, $x, $y) = @_;
1830 1982
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1983 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1984 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 1985 $self->{state} = !$self->{state};
1834 $self->_emit (changed => $self->{state}); 1986 $self->_emit (changed => $self->{state});
1987 } else {
1988 return 0
1989 }
1990
1835 } 1991 1
1836} 1992}
1837 1993
1838sub _draw { 1994sub _draw {
1839 my ($self) = @_; 1995 my ($self) = @_;
1840 1996
1841 $self->SUPER::_draw; 1997 $self->SUPER::_draw;
1842 1998
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1999 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1844 2000
1845 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2001 my ($w, $h) = @$self{qw(w h)};
2002
2003 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1846 2004
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2005 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2006
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2007 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2008
… …
2005 2163
2006 my $h1 = $self->{h} * (1 - $ycut1); 2164 my $h1 = $self->{h} * (1 - $ycut1);
2007 my $h2 = $self->{h} * (1 - $ycut2); 2165 my $h2 = $self->{h} * (1 - $ycut2);
2008 2166
2009 glEnable GL_BLEND; 2167 glEnable GL_BLEND;
2010 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2168 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2169 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2011 glEnable GL_TEXTURE_2D; 2170 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2171 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2172
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2173 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2174 glBegin GL_QUADS;
… …
2115 fg => [1, 1, 1], 2274 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 2275 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 2276 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 2277 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 2278 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 2279 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 2280 min_h => $::WIDTH / 80,
2122 vertical => 0, 2281 vertical => 0,
2123 can_hover => 1, 2282 can_hover => 1,
2124 inner_pad => 0.02, 2283 inner_pad => 0.02,
2125 @_ 2284 @_
2126 ); 2285 );
… …
2129 $self->update; 2288 $self->update;
2130 2289
2131 $self 2290 $self
2132} 2291}
2133 2292
2293sub changed { }
2294
2134sub set_range { 2295sub set_range {
2135 my ($self, $range) = @_; 2296 my ($self, $range) = @_;
2136 2297
2137 $self->{range} = $range; 2298 ($range, $self->{range}) = ($self->{range}, $range);
2138 2299
2139 $self->update; 2300 $self->update
2301 if "@$range" ne "@{$self->{range}}";
2140} 2302}
2141 2303
2142sub set_value { 2304sub set_value {
2143 my ($self, $value) = @_; 2305 my ($self, $value) = @_;
2144 2306
… …
2163} 2325}
2164 2326
2165sub size_request { 2327sub size_request {
2166 my ($self) = @_; 2328 my ($self) = @_;
2167 2329
2168 my $w = $self->{req_w}; 2330 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 2331}
2173 2332
2174sub button_down { 2333sub button_down {
2175 my ($self, $ev, $x, $y) = @_; 2334 my ($self, $ev, $x, $y) = @_;
2176 2335
2177 $self->SUPER::button_down ($ev, $x, $y); 2336 $self->SUPER::button_down ($ev, $x, $y);
2178 2337
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2338 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 2339
2181 $self->mouse_motion ($ev, $x, $y); 2340 $self->mouse_motion ($ev, $x, $y)
2182} 2341}
2183 2342
2184sub mouse_motion { 2343sub mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 2344 my ($self, $ev, $x, $y) = @_;
2186 2345
… …
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2349 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 2350
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2351 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2193 2352
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2353 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2354 } else {
2355 return 0;
2356 }
2357
2195 } 2358 1
2196} 2359}
2197 2360
2198sub update { 2361sub update {
2199 my ($self) = @_; 2362 my ($self) = @_;
2200 2363
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2364 delete $self->{knob_w};
2365 $self->SUPER::update;
2366}
2367
2368sub _draw {
2369 my ($self) = @_;
2370
2371 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2203 2373
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2374 my ($value, $lo, $hi, $page) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 2375 my $range = ($hi - $page - $lo) || 1e-100;
2206 2376
… …
2212 $value = ($value - $lo) / $range; 2382 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 2383 $value = $value * $self->{scale} + $self->{offset};
2214 2384
2215 $self->{knob_x} = $value - $knob_w * 0.5; 2385 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 2386 $self->{knob_w} = $knob_w;
2217 }); 2387 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 2388
2225 $self->SUPER::_draw (); 2389 $self->SUPER::_draw ();
2226 2390
2227 glScale $self->{w}, $self->{h}; 2391 glScale $self->{w}, $self->{h};
2228 2392
… …
2422 2586
2423 delete $self->{texture}; 2587 delete $self->{texture};
2424 } 2588 }
2425 2589
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 2590 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 2591 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 2592 glClear GL_COLOR_BUFFER_BIT;
2429 2593
2430 my $top = int $self->{children}[1]{range}[0]; 2594 my $top = int $self->{children}[1]{range}[0];
2431 2595
2432 my $y0 = $top; 2596 my $y0 = $top;
… …
2467sub _draw { 2631sub _draw {
2468 my ($self) = @_; 2632 my ($self) = @_;
2469 2633
2470 glEnable GL_TEXTURE_2D; 2634 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2635 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 2636 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2637 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2474 glDisable GL_TEXTURE_2D; 2638 glDisable GL_TEXTURE_2D;
2475 2639
2476 $self->{children}[1]->draw; 2640 $self->{children}[1]->draw;
2477 2641
2478} 2642}
… …
2527 2691
2528sub new { 2692sub new {
2529 my $class = shift; 2693 my $class = shift;
2530 2694
2531 my $self = $class->SUPER::new ( 2695 my $self = $class->SUPER::new (
2532 state => 0, 2696 state => 0,
2533 connect_activate => \&toggle_flopper, 2697 on_activate => \&toggle_flopper,
2534 @_ 2698 @_
2535 ); 2699 );
2536 2700
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 2701 $self
2543} 2702}
2544 2703
2545sub toggle_flopper { 2704sub toggle_flopper {
2546 my ($self) = @_; 2705 my ($self) = @_;
2547 2706
2548 # TODO: use animation 2707 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 2708}
2560 2709
2561############################################################################# 2710#############################################################################
2562 2711
2563package CFClient::UI::Tooltip; 2712package CFClient::UI::Tooltip;
… …
2576} 2725}
2577 2726
2578sub set_tooltip_from { 2727sub set_tooltip_from {
2579 my ($self, $widget) = @_; 2728 my ($self, $widget) = @_;
2580 2729
2730 my $tooltip = $widget->{tooltip};
2731
2732 if ($ENV{CFPLUS_DEBUG} & 2) {
2733 $tooltip .= "\n\n" . (ref $widget) . "\n"
2734 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2735 . "req $widget->{req_w} $widget->{req_h}\n"
2736 . "visible $widget->{visible}";
2737 }
2738
2581 $self->add (new CFClient::UI::Label 2739 $self->add (new CFClient::UI::Label
2582 markup => $widget->{tooltip}, 2740 markup => $tooltip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2741 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2584 fontsize => 0.8, 2742 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 2743 fg => [0, 0, 0, 1],
2586 ellipsise => 0, 2744 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 2745 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2598 2756
2599sub size_allocate { 2757sub size_allocate {
2600 my ($self, $w, $h) = @_; 2758 my ($self, $w, $h) = @_;
2601 2759
2602 $self->SUPER::size_allocate ($w - 4, $h - 4); 2760 $self->SUPER::size_allocate ($w - 4, $h - 4);
2761}
2762
2763sub visibility_change {
2764 my ($self, $visible) = @_;
2765
2766 return unless $visible;
2767
2768 $self->{root}->on_post_alloc ("move_$self" => sub {
2769 my $widget = $self->{owner}
2770 or return;
2771
2772 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2773
2774 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2775 if $x + $self->{w} > $::WIDTH;
2776
2777 $self->move_abs ($x, $y);
2778 });
2603} 2779}
2604 2780
2605sub _draw { 2781sub _draw {
2606 my ($self) = @_; 2782 my ($self) = @_;
2607 2783
… …
2624 glVertex $w, $h; 2800 glVertex $w, $h;
2625 glVertex $w, 0; 2801 glVertex $w, 0;
2626 glEnd; 2802 glEnd;
2627 2803
2628 glTranslate 2 - 0.375, 2 - 0.375; 2804 glTranslate 2 - 0.375, 2 - 0.375;
2805
2629 $self->SUPER::_draw; 2806 $self->SUPER::_draw;
2630} 2807}
2631 2808
2632############################################################################# 2809#############################################################################
2633 2810
… …
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 2869 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693 2870
2694 if ($tex) { 2871 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 2872 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 2874 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 2876 glDisable GL_TEXTURE_2D;
2700 } 2877 }
2701} 2878}
2702 2879
… …
2709 $self->SUPER::DESTROY; 2886 $self->SUPER::DESTROY;
2710} 2887}
2711 2888
2712############################################################################# 2889#############################################################################
2713 2890
2714package CFClient::UI::Inventory; 2891package CFClient::UI::Buttonbar;
2715 2892
2716our @ISA = CFClient::UI::ScrolledWindow::; 2893our @ISA = CFClient::UI::HBox::;
2717 2894
2718sub new { 2895# TODO: should actualyl wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my $self = $class->SUPER::new (
2722 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2723 @_,
2724 );
2725
2726 $self
2727}
2728
2729sub set_items {
2730 my ($self, $items) = @_;
2731
2732 $self->{scrolled}->clear;
2733 return unless $items;
2734
2735 my @items = sort {
2736 ($a->{type} <=> $b->{type})
2737 or ($a->{name} cmp $b->{name})
2738 } @$items;
2739
2740 $self->{real_items} = \@items;
2741
2742 my $row = 0;
2743 for my $item (@items) {
2744 CFClient::Item::update_widgets $item;
2745
2746 $self->{scrolled}->add (0, $row, $item->{face_widget});
2747 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2748 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2749
2750 $row++;
2751 }
2752
2753# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2754}
2755
2756sub size_request {
2757 my ($self) = @_;
2758 ($self->{req_w}, $self->{req_h});
2759}
2760 2896
2761############################################################################# 2897#############################################################################
2762 2898
2763package CFClient::UI::Menu; 2899package CFClient::UI::Menu;
2764 2900
… …
2805 # maybe save $GRAB? must be careful about events... 2941 # maybe save $GRAB? must be careful about events...
2806 $GRAB = $self; 2942 $GRAB = $self;
2807 $self->{button} = $ev->{button}; 2943 $self->{button} = $ev->{button};
2808 2944
2809 $self->show; 2945 $self->show;
2810 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2946 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2811} 2947}
2812 2948
2813sub mouse_motion { 2949sub mouse_motion {
2814 my ($self, $ev, $x, $y) = @_; 2950 my ($self, $ev, $x, $y) = @_;
2815 2951
2816 # TODO: should use vbox->find_widget or so 2952 # TODO: should use vbox->find_widget or so
2817 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2953 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2818 $self->{hover} = $self->{item}{$HOVER}; 2954 $self->{hover} = $self->{item}{$HOVER};
2955
2956 0
2819} 2957}
2820 2958
2821sub button_up { 2959sub button_up {
2822 my ($self, $ev, $x, $y) = @_; 2960 my ($self, $ev, $x, $y) = @_;
2823 2961
… …
2825 undef $GRAB; 2963 undef $GRAB;
2826 $self->hide; 2964 $self->hide;
2827 2965
2828 $self->_emit ("popdown"); 2966 $self->_emit ("popdown");
2829 $self->{hover}[1]->() if $self->{hover}; 2967 $self->{hover}[1]->() if $self->{hover};
2968 } else {
2969 return 0
2970 }
2971
2830 } 2972 1
2831} 2973}
2832 2974
2833############################################################################# 2975#############################################################################
2834 2976
2835package CFClient::UI::Statusbox; 2977package CFClient::UI::Multiplexer;
2836 2978
2837our @ISA = CFClient::UI::VBox::; 2979our @ISA = CFClient::UI::Container::;
2838 2980
2839sub new { 2981sub new {
2840 my $class = shift; 2982 my $class = shift;
2841 2983
2842 $class->SUPER::new ( 2984 my $self = $class->SUPER::new (
2985 @_,
2986 );
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990
2991 $self
2992}
2993
2994sub add {
2995 my ($self, @widgets) = @_;
2996
2997 $self->SUPER::add (@widgets);
2998
2999 $self->{current} = $self->{children}[0]
3000 if @{ $self->{children} };
3001}
3002
3003sub set_current_page {
3004 my ($self, $page_or_widget) = @_;
3005
3006 my $widget = ref $page_or_widget
3007 ? $page_or_widget
3008 : $self->{children}[$page_or_widget];
3009
3010 $self->{current} = $widget;
3011 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3012
3013 $self->_emit (page_changed => $self->{current});
3014
3015 $self->realloc;
3016}
3017
3018sub visible_children {
3019 $_[0]{current}
3020}
3021
3022sub size_request {
3023 my ($self) = @_;
3024
3025 $self->{current}->size_request
3026}
3027
3028sub size_allocate {
3029 my ($self, $w, $h) = @_;
3030
3031 $self->{current}->configure (0, 0, $w, $h);
3032}
3033
3034sub _draw {
3035 my ($self) = @_;
3036
3037 $self->{current}->draw;
3038}
3039
3040#############################################################################
3041
3042package CFClient::UI::Notebook;
3043
3044our @ISA = CFClient::UI::VBox::;
3045
3046sub new {
3047 my $class = shift;
3048
3049 my $self = $class->SUPER::new (
3050 buttonbar => (new CFClient::UI::Buttonbar),
3051 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3052 # filter => # will be put between multiplexer and $self
3053 @_,
3054 );
3055
3056 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3057 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3058
3059 $self
3060}
3061
3062sub add {
3063 my ($self, $title, $widget, $tooltip) = @_;
3064
3065 Scalar::Util::weaken $self;
3066
3067 $self->{buttonbar}->add (new CFClient::UI::Button
3068 markup => $title,
3069 tooltip => $tooltip,
3070 on_activate => sub { $self->set_current_page ($widget) },
3071 );
3072
3073 $self->{multiplexer}->add ($widget);
3074}
3075
3076sub set_current_page {
3077 my ($self, $page) = @_;
3078
3079 $self->{multiplexer}->set_current_page ($page);
3080 $self->_emit (page_changed => $self->{multiplexer}{current});
3081}
3082
3083#############################################################################
3084
3085package CFClient::UI::Statusbox;
3086
3087our @ISA = CFClient::UI::VBox::;
3088
3089sub new {
3090 my $class = shift;
3091
3092 my $self = $class->SUPER::new (
2843 fontsize => 0.8, 3093 fontsize => 0.8,
2844 @_, 3094 @_,
2845 ) 3095 );
3096
3097 Scalar::Util::weaken (my $this = $self);
3098
3099 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3100
3101 $self
2846} 3102}
2847 3103
2848sub reorder { 3104sub reorder {
2849 my ($self) = @_; 3105 my ($self) = @_;
2850 my $NOW = time; 3106 my $NOW = Time::HiRes::time;
3107
3108 # freeze display when hovering over any label
3109 return if $CFClient::UI::TOOLTIP->{owner}
3110 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3111 values %{ $self->{item} };
2851 3112
2852 while (my ($k, $v) = each %{ $self->{item} }) { 3113 while (my ($k, $v) = each %{ $self->{item} }) {
2853 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3114 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2854 } 3115 }
2855 3116
… …
2858 my @items = sort { 3119 my @items = sort {
2859 $a->{pri} <=> $b->{pri} 3120 $a->{pri} <=> $b->{pri}
2860 or $b->{id} <=> $a->{id} 3121 or $b->{id} <=> $a->{id}
2861 } values %{ $self->{item} }; 3122 } values %{ $self->{item} };
2862 3123
3124 $self->{timer}->interval (1);
3125
2863 my $count = 10 + 1; 3126 my $count = 10 + 1;
2864 for my $item (@items) { 3127 for my $item (@items) {
2865 last unless --$count; 3128 last unless --$count;
2866 3129
2867 push @widgets, $item->{label} ||= do { 3130 my $label = $item->{label} ||= do {
2868 # TODO: doesn't handle markup well (read as: at all) 3131 # TODO: doesn't handle markup well (read as: at all)
2869 my $short = $item->{count} > 1 3132 my $short = $item->{count} > 1
2870 ? "<b>$item->{count} ×</b> $item->{text}" 3133 ? "<b>$item->{count} ×</b> $item->{text}"
2871 : $item->{text}; 3134 : $item->{text};
2872 3135
… …
2880 tooltip => $item->{tooltip}, 3143 tooltip => $item->{tooltip},
2881 tooltip_font => $::FONT_PROP, 3144 tooltip_font => $::FONT_PROP,
2882 tooltip_width => 0.67, 3145 tooltip_width => 0.67,
2883 fontsize => $item->{fontsize} || $self->{fontsize}, 3146 fontsize => $item->{fontsize} || $self->{fontsize},
2884 max_w => $::WIDTH * 0.44, 3147 max_w => $::WIDTH * 0.44,
2885 fg => $item->{fg}, 3148 fg => [@{ $item->{fg} }],
2886 can_events => 1, 3149 can_events => 1,
2887 can_hover => 1 3150 can_hover => 1
2888 }; 3151 };
3152
3153 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3154 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3155 $label->update;
3156 $label->set_max_size (undef, $label->{req_h} * $diff)
3157 if $diff < 1;
3158 $self->{timer}->interval (1/30);
3159 } else {
3160 $label->{fg}[3] = $item->{fg}[3] || 1;
3161 }
3162
3163 push @widgets, $label;
2889 } 3164 }
2890 3165
2891 $self->clear; 3166 $self->clear;
2892 $self->SUPER::add (reverse @widgets); 3167 $self->SUPER::add (reverse @widgets);
2893} 3168}
… …
2898 $text =~ s/^\s+//; 3173 $text =~ s/^\s+//;
2899 $text =~ s/\s+$//; 3174 $text =~ s/\s+$//;
2900 3175
2901 return unless $text; 3176 return unless $text;
2902 3177
2903 my $timeout = time + ((delete $arg{timeout}) || 60); 3178 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2904 3179
2905 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3180 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2906 3181
2907 if (my $item = $self->{item}{$group}) { 3182 if (my $item = $self->{item}{$group}) {
2908 if ($item->{text} eq $text) { 3183 if ($item->{text} eq $text) {
… …
2938 3213
2939 $self->reorder; 3214 $self->reorder;
2940 $self->SUPER::reconfigure; 3215 $self->SUPER::reconfigure;
2941} 3216}
2942 3217
3218sub DESTROY {
3219 my ($self) = @_;
3220
3221 $self->{timer}->cancel;
3222
3223 $self->SUPER::DESTROY;
3224}
3225
2943############################################################################# 3226#############################################################################
2944 3227
2945package CFClient::UI::Root; 3228package CFClient::UI::Inventory;
2946 3229
2947our @ISA = CFClient::UI::Container::; 3230our @ISA = CFClient::UI::ScrolledWindow::;
2948
2949use CFClient::OpenGL;
2950 3231
2951sub new { 3232sub new {
2952 my $class = shift; 3233 my $class = shift;
2953 3234
2954 $class->SUPER::new ( 3235 my $self = $class->SUPER::new (
3236 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3237 @_,
3238 );
3239
3240 $self
3241}
3242
3243sub set_items {
3244 my ($self, $items) = @_;
3245
3246 $self->{child}->clear;
3247 return unless $items;
3248
3249 my @items = sort {
3250 ($a->{type} <=> $b->{type})
3251 or ($a->{name} cmp $b->{name})
3252 } @$items;
3253
3254 $self->{real_items} = \@items;
3255
3256 my $row = 0;
3257 for my $item (@items) {
3258 CFClient::Item::update_widgets $item;
3259
3260 $self->{child}->add (0, $row, $item->{face_widget});
3261 $self->{child}->add (1, $row, $item->{desc_widget});
3262 $self->{child}->add (2, $row, $item->{weight_widget});
3263
3264 $row++;
3265 }
3266}
3267
3268#############################################################################
3269
3270package CFClient::UI::BindEditor;
3271
3272our @ISA = CFClient::UI::FancyFrame::;
3273
3274sub new {
3275 my $class = shift;
3276
3277 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3278
3279 $self->add (my $vb = new CFClient::UI::VBox);
3280
3281
3282 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3283 text => "start recording",
3284 tooltip => "Start/Stops recording of actions."
3285 ."All subsequent actions after the recording started will be captured."
3286 ."The actions are displayed after the record was stopped."
3287 ."To bind the action you have to click on the 'Bind' button",
3288 on_activate => sub {
3289 unless ($self->{recording}) {
3290 $self->start;
3291 } else {
3292 $self->stop;
3293 }
3294 });
3295
3296 $vb->add (new CFClient::UI::Label text => "Actions:");
3297 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3298
3299 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3300 $vb->add (my $hb = new CFClient::UI::HBox);
3301 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3302 $hb->add (new CFClient::UI::Button
3303 text => "bind",
3304 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3305 on_activate => sub {
3306 $self->ask_for_bind;
3307 });
3308
3309 $vb->add (my $hb = new CFClient::UI::HBox);
3310 $hb->add (new CFClient::UI::Button
3311 text => "ok",
3312 expand => 1,
3313 tooltip => "This closes the binding editor and saves the binding",
3314 on_activate => sub {
3315 $self->hide;
3316 $self->commit;
3317 });
3318
3319 $hb->add (new CFClient::UI::Button
3320 text => "cancel",
3321 expand => 1,
3322 tooltip => "This closes the binding editor without saving",
3323 on_activate => sub {
3324 $self->hide;
3325 $self->{binding_cancel}->()
3326 if $self->{binding_cancel};
3327 });
3328
3329 $self->update_binding_widgets;
3330
3331 $self
3332}
3333
3334sub commit {
3335 my ($self) = @_;
3336 my ($mod, $sym, $cmds) = $self->get_binding;
3337 if ($sym != 0 && @$cmds > 0) {
3338 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3339 ."'. Don't forget 'Save Config'!");
3340 $self->{binding_change}->($mod, $sym, $cmds)
3341 if $self->{binding_change};
3342 } else {
3343 $::STATUSBOX->add ("No action bound, no key or action specified!");
3344 $self->{binding_cancel}->()
3345 if $self->{binding_cancel};
3346 }
3347}
3348
3349sub start {
3350 my ($self) = @_;
3351
3352 $self->{rec_btn}->set_text ("stop recording");
3353 $self->{recording} = 1;
3354 $self->clear_command_list;
3355 $::CONN->start_record if $::CONN;
3356}
3357
3358sub stop {
3359 my ($self) = @_;
3360
3361 $self->{rec_btn}->set_text ("start recording");
3362 $self->{recording} = 0;
3363
3364 my $rec;
3365 $rec = $::CONN->stop_record if $::CONN;
3366 return unless ref $rec eq 'ARRAY';
3367 $self->set_command_list ($rec);
3368}
3369
3370
3371sub ask_for_bind_and_commit {
3372 my ($self) = @_;
3373 $self->ask_for_bind (1);
3374}
3375
3376sub ask_for_bind {
3377 my ($self, $commit) = @_;
3378
3379 CFClient::Binder::open_binding_dialog (sub {
3380 my ($mod, $sym) = @_;
3381 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3382 $self->update_binding_widgets;
3383 $self->commit if $commit;
3384 });
3385}
3386
3387# $mod and $sym are the modifiers and key symbol
3388# $cmds is a array ref of strings (the commands)
3389# $cb is the callback that is executed on OK
3390# $ccb is the callback that is executed on CANCEL and
3391# when the binding was unsuccessful on OK
3392sub set_binding {
3393 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3394
3395 $self->clear_command_list;
3396 $self->{recording} = 0;
3397 $self->{rec_btn}->set_text ("start recording");
3398
3399 $self->{binding} = [$mod, $sym];
3400 $self->{commands} = $cmds;
3401
3402 $self->{binding_change} = $cb;
3403 $self->{binding_cancel} = $ccb;
3404
3405 $self->update_binding_widgets;
3406}
3407
3408# this is a shortcut method that asks for a binding
3409# and then just binds it.
3410sub do_quick_binding {
3411 my ($self, $cmds) = @_;
3412 $self->set_binding (undef, undef, $cmds, sub {
3413 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3414 });
3415 $self->ask_for_bind (1);
3416}
3417
3418sub update_binding_widgets {
3419 my ($self) = @_;
3420 my ($mod, $sym, $cmds) = $self->get_binding;
3421 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3422 $self->set_command_list ($cmds);
3423}
3424
3425sub get_binding {
3426 my ($self) = @_;
3427 return (
3428 $self->{binding}->[0],
3429 $self->{binding}->[1],
3430 [ grep { defined $_ } @{$self->{commands}} ]
3431 );
3432}
3433
3434sub clear_command_list {
3435 my ($self) = @_;
3436 $self->{cmdbox}->clear ();
3437}
3438
3439sub set_command_list {
3440 my ($self, $cmds) = @_;
3441
3442 $self->{cmdbox}->clear ();
3443 $self->{commands} = $cmds;
3444
3445 my $idx = 0;
3446
3447 for (@$cmds) {
3448 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3449
3450 my $i = $idx;
3451 $hb->add (new CFClient::UI::Label text => $_);
3452 $hb->add (new CFClient::UI::Button
3453 text => "delete",
3454 tooltip => "Deletes the action from the record",
3455 on_activate => sub {
3456 $self->{cmdbox}->remove ($hb);
3457 $cmds->[$i] = undef;
3458 });
3459
3460
3461 $idx++
3462 }
3463}
3464
3465#############################################################################
3466
3467package CFClient::UI::SpellList;
3468
3469our @ISA = CFClient::UI::Table::;
3470
3471sub new {
3472 my $class = shift;
3473
3474 my $self = $class->SUPER::new (
3475 binding => [],
3476 commands => [],
2955 @_, 3477 @_,
2956 ) 3478 )
2957} 3479}
2958 3480
2959sub configure { 3481# XXX: Do sorting? Argl...
2960 my ($self, $x, $y, $w, $h) = @_; 3482sub add_spell {
2961
2962 $self->{w} = $w;
2963 $self->{h} = $h;
2964}
2965
2966sub check_size {
2967 my ($self) = @_; 3483 my ($self, $spell) = @_;
3484 $self->{spells}->{$spell->{name}} = $spell;
2968 3485
2969 $self->size_allocate ($self->{w}, $self->{h}) 3486 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2970 if $self->{w}; 3487 face => $spell->{face},
3488 can_hover => 1,
3489 can_events => 1,
3490 tooltip => $spell->{message});
3491
3492 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3493 text => $spell->{name},
3494 can_hover => 1,
3495 can_events => 1,
3496 tooltip => $spell->{message},
3497 expand => 1);
3498
3499 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3500 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3501 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3502 expand => 1);
3503
3504 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3505 text => "bind to key",
3506 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3507}
3508
3509sub rebuild_spell_list {
3510 my ($self) = @_;
3511 $self->{tbl_idx} = 0;
3512 $self->add_spell ($_) for values %{$self->{spells}};
3513}
3514
3515sub remove_spell {
3516 my ($self, $spell) = @_;
3517 delete $self->{spells}->{$spell->{name}};
3518 $self->rebuild_spell_list;
3519}
3520
3521#############################################################################
3522
3523package CFClient::UI::Root;
3524
3525our @ISA = CFClient::UI::Container::;
3526
3527use List::Util qw(min max);
3528
3529use CFClient::OpenGL;
3530
3531sub new {
3532 my $class = shift;
3533
3534 my $self = $class->SUPER::new (
3535 visible => 1,
3536 @_,
3537 );
3538
3539 Scalar::Util::weaken ($self->{root} = $self);
3540
3541 $self
2971} 3542}
2972 3543
2973sub size_request { 3544sub size_request {
2974 my ($self) = @_; 3545 my ($self) = @_;
2975 3546
2976 ($self->{w}, $self->{h}) 3547 ($self->{w}, $self->{h})
3548}
3549
3550sub _to_pixel {
3551 my ($coord, $size, $max) = @_;
3552
3553 $coord =
3554 $coord eq "center" ? ($max - $size) * 0.5
3555 : $coord eq "max" ? $max
3556 : $coord;
3557
3558 $coord = 0 if $coord < 0;
3559 $coord = $max - $size if $coord > $max - $size;
3560
3561 int $coord + 0.5
2977} 3562}
2978 3563
2979sub size_allocate { 3564sub size_allocate {
2980 my ($self, $w, $h) = @_; 3565 my ($self, $w, $h) = @_;
2981 3566
2982 for my $child ($self->children) { 3567 for my $child ($self->children) {
2983 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3568 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2984 3569
2985 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3570 $X = $child->{force_x} if exists $child->{force_x};
2986 if exists $child->{req_x}; 3571 $Y = $child->{force_y} if exists $child->{force_y};
2987 3572
2988 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3573 $X = _to_pixel $X, $W, $self->{w};
2989 if exists $child->{req_y}; 3574 $Y = _to_pixel $Y, $H, $self->{h};
2990
2991 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2992 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2993 3575
2994 $child->configure ($X, $Y, $W, $H); 3576 $child->configure ($X, $Y, $W, $H);
2995 } 3577 }
2996} 3578}
2997 3579
… …
3008} 3590}
3009 3591
3010sub update { 3592sub update {
3011 my ($self) = @_; 3593 my ($self) = @_;
3012 3594
3013 $self->check_size;
3014 $::WANT_REFRESH++; 3595 $::WANT_REFRESH++;
3015} 3596}
3016 3597
3017sub add { 3598sub add {
3018 my ($self, @children) = @_; 3599 my ($self, @children) = @_;
3019 3600
3020 for (my @widgets = @children; my $w = pop @widgets; ) {
3021 push @widgets, $w->children;
3022 $w->{root} = $self;
3023 $w->{visible} = 1;
3024 }
3025
3026 for my $child (@children) {
3027 $child->{is_toplevel} = 1; 3601 $_->{is_toplevel} = 1
3028 3602 for @children;
3029 # integerise window positions
3030 $child->{x} = int $child->{x};
3031 $child->{y} = int $child->{y};
3032 }
3033 3603
3034 $self->SUPER::add (@children); 3604 $self->SUPER::add (@children);
3035} 3605}
3036 3606
3037sub remove { 3607sub remove {
3038 my ($self, @children) = @_; 3608 my ($self, @children) = @_;
3039 3609
3040 $self->SUPER::remove (@children); 3610 $self->SUPER::remove (@children);
3611
3612 delete $self->{is_toplevel}
3613 for @children;
3041 3614
3042 while (@children) { 3615 while (@children) {
3043 my $w = pop @children; 3616 my $w = pop @children;
3044 push @children, $w->children; 3617 push @children, $w->children;
3045 $w->set_invisible; 3618 $w->set_invisible;
… …
3064 while ($self->{refresh_hook}) { 3637 while ($self->{refresh_hook}) {
3065 $_->() 3638 $_->()
3066 for values %{delete $self->{refresh_hook}}; 3639 for values %{delete $self->{refresh_hook}};
3067 } 3640 }
3068 3641
3069 if ($self->{check_size}) { 3642 if ($self->{realloc}) {
3070 my @queue = ([], []); 3643 my %queue;
3644 my @queue;
3645 my $widget;
3071 3646
3072 for (;;) { 3647 outer:
3073 if ($self->{check_size}) { 3648 while () {
3074 # heuristic: check containers last 3649 if (my $realloc = delete $self->{realloc}) {
3075 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3650 for $widget (values %$realloc) {
3076 for values %{delete $self->{check_size}} 3651 $widget->{visible} or next; # do not resize invisible widgets
3652
3653 $queue{$widget+0}++ and next; # duplicates are common
3654
3655 push @{ $queue[$widget->{visible}] }, $widget;
3656 }
3077 } 3657 }
3078 3658
3079 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3659 while () {
3660 @queue or last outer;
3080 3661
3081 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3662 $widget = pop @{ $queue[-1] || [] }
3082 ? @$widget{qw(user_w user_h)} 3663 and last;
3083 : $widget->size_request;
3084
3085 if (delete $widget->{force_alloc}
3086 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3087 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3088 3664
3665 pop @queue;
3666 }
3667
3668 delete $queue{$widget+0};
3669
3670 my ($w, $h) = $widget->size_request;
3671
3672 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3673 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3674
3675 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3676 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3677
3678 $w = $widget->{force_w} if exists $widget->{force_w};
3679 $h = $widget->{force_h} if exists $widget->{force_h};
3680
3681 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3682 || delete $widget->{force_realloc}) {
3089 $widget->{req_w} = $w; 3683 $widget->{req_w} = $w;
3090 $widget->{req_h} = $h; 3684 $widget->{req_h} = $h;
3091 3685
3092 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3686 $self->{size_alloc}{$widget+0} = $widget;
3093 3687
3094 $widget->{parent}->check_size
3095 if $widget->{parent}; 3688 if (my $parent = $widget->{parent}) {
3689 $self->{realloc}{$parent+0} = $parent
3690 unless $queue{$parent+0};
3691
3692 $parent->{force_size_alloc} = 1;
3693 $self->{size_alloc}{$parent+0} = $parent;
3694 }
3096 } 3695 }
3696
3697 delete $self->{realloc}{$widget+0};
3097 } 3698 }
3098 } 3699 }
3099 3700
3100 while ($self->{size_alloc}) { 3701 while (my $size_alloc = delete $self->{size_alloc}) {
3101 for (values %{delete $self->{size_alloc}}) { 3702 my @queue = sort { $b->{visible} <=> $a->{visible} }
3102 my ($widget, $w, $h) = @$_; 3703 values %$size_alloc;
3704
3705 while () {
3706 my $widget = pop @queue || last;
3707
3708 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3103 3709
3104 $w = 0 if $w < 0; 3710 $w = 0 if $w < 0;
3105 $h = 0 if $h < 0; 3711 $h = 0 if $h < 0;
3106 3712
3713 $w = int $w + 0.5;
3714 $h = int $h + 0.5;
3715
3716 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3717 $widget->{old_w} = $widget->{w};
3718 $widget->{old_h} = $widget->{h};
3719
3107 $widget->{w} = $w; 3720 $widget->{w} = $w;
3108 $widget->{h} = $h; 3721 $widget->{h} = $h;
3722
3109 $widget->emit (size_allocate => $w, $h); 3723 $widget->emit (size_allocate => $w, $h);
3724 }
3110 } 3725 }
3111 } 3726 }
3112 3727
3113 while ($self->{post_alloc_hook}) { 3728 while ($self->{post_alloc_hook}) {
3114 $_->() 3729 $_->()
3115 for values %{delete $self->{post_alloc_hook}}; 3730 for values %{delete $self->{post_alloc_hook}};
3116 } 3731 }
3732
3117 3733
3118 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3734 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3119 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3735 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3120 glClear GL_COLOR_BUFFER_BIT; 3736 glClear GL_COLOR_BUFFER_BIT;
3121 3737
… …
3123 glLoadIdentity; 3739 glLoadIdentity;
3124 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3740 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3125 glMatrixMode GL_MODELVIEW; 3741 glMatrixMode GL_MODELVIEW;
3126 glLoadIdentity; 3742 glLoadIdentity;
3127 3743
3744 {
3745 package CFClient::UI::Base;
3746
3747 ($draw_x, $draw_y, $draw_w, $draw_h) =
3748 (0, 0, $self->{w}, $self->{h});
3749 }
3750
3128 $self->_draw; 3751 $self->_draw;
3129} 3752}
3130 3753
3131############################################################################# 3754#############################################################################
3132 3755

Diff Legend

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