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.245 by elmex, Sat May 27 21:15:57 2006 UTC vs.
Revision 1.288 by root, Mon Jun 5 21:14:40 2006 UTC

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

Diff Legend

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