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.230 by root, Wed May 24 21:59:54 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

… …
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8 8
9use CFClient; 9use CFClient;
10use CFClient::Texture;
10 11
11our ($FOCUS, $HOVER, $GRAB); # various widgets 12our ($FOCUS, $HOVER, $GRAB); # various widgets
12 13
14our $LAYOUT;
13our $ROOT; 15our $ROOT;
14our $TOOLTIP; 16our $TOOLTIP;
15our $BUTTON_STATE; 17our $BUTTON_STATE;
16 18
17our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
18 20
21sub get_layout {
22 my $layout;
23
24 for (grep { $_->{name} } values %WIDGET) {
25 my $win = $layout->{$_->{name}} = { };
26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
31
32 $win->{show} = $_->{visible} && $_->{is_toplevel};
33 }
34
35 $layout
36}
37
38sub set_layout {
39 my ($layout) = @_;
40
41 $LAYOUT = $layout;
42}
43
19sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
20 if (!$GRAB) { 47 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
25 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
26 54
27 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
28 56
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 58
31 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 60 $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 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
158sub rescale_widgets { 171sub rescale_widgets {
159 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
160 173
161 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
162 if ($widget->{is_toplevel}) { 175 if ($widget->{is_toplevel}) {
176 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
177 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
178
163 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
164 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
165 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
166 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
167 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
168 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
169 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
170 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 185
186 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
187 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
188
171 } 189 }
172 } 190 }
173 191
174 reconfigure_widgets; 192 reconfigure_widgets;
175} 193}
… …
184 202
185sub new { 203sub new {
186 my $class = shift; 204 my $class = shift;
187 205
188 my $self = bless { 206 my $self = bless {
189 x => 0, 207 x => "center",
190 y => 0, 208 y => "center",
191 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
192 can_events => 1, 212 can_events => 1,
193 @_ 213 @_
194 }, $class; 214 }, $class;
195 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
196 for (keys %$self) { 218 for (keys %$self) {
197 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
198 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
199 } 221 }
200 } 222 }
201 223
202 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 224 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
225 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
226 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
227 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
228 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
229
230 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
231 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
232
233 $self->show if $layout->{show};
234 }
203 235
204 $self 236 $self
205} 237}
206 238
207sub destroy { 239sub destroy {
… …
211 %$self = (); 243 %$self = ();
212} 244}
213 245
214sub show { 246sub show {
215 my ($self) = @_; 247 my ($self) = @_;
248
216 return if $self->{parent}; 249 return if $self->{parent};
217 250
218 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
219} 252}
220 253
221sub show_centered { 254sub set_visible {
222 my ($self) = @_; 255 my ($self) = @_;
256
223 return if $self->{parent}; 257 return if $self->{visible};
224 258
225 $self->show; 259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
226 261
227 $CFClient::UI::ROOT->on_post_alloc ( 262 $self->emit (visibility_change => 1);
228 "centered $self" => sub {
229 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5);
230 },
231 );
232}
233 263
234sub hide { 264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
235 my ($self) = @_; 270 my ($self) = @_;
271
272 return unless $self->{visible};
273
274 $_->set_invisible for $self->children;
275
276 delete $self->{root};
277 delete $self->{visible};
236 278
237 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
238 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
239 281
282 CFClient::UI::check_tooltip
283 if $TOOLTIP->{owner} == $self;
284
285 $self->focus_out;
286
287 $self->emit (visibility_change => 0);
288}
289
290sub set_visibility {
291 my ($self, $visible) = @_;
292
293 return if $self->{visible} == $visible;
294
295 $visible ? $self->hide
296 : $self->show;
297}
298
299sub toggle_visibility {
300 my ($self) = @_;
301
302 $self->{visible}
303 ? $self->hide
304 : $self->show;
305}
306
307sub hide {
308 my ($self) = @_;
309
310 $self->set_invisible;
311
240 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
241 if $self->{parent}; 313 if $self->{parent};
242} 314}
243 315
244sub move { 316sub move_abs {
245 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
246 318
247 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
248 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
249 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
250 322
251 $self->update; 323 $self->update;
252} 324}
253 325
254sub set_size { 326sub set_size {
255 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
256 328
257 $self->{user_w} = $w; 329 $self->{force_w} = $w;
258 $self->{user_h} = $h; 330 $self->{force_h} = $h;
259 331
260 $self->check_size; 332 $self->realloc;
261} 333}
262 334
263sub size_request { 335sub size_request {
264 require Carp; 336 require Carp;
265 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
267 339
268sub configure { 340sub configure {
269 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
270 342
271 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
272 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
273 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
274 348
275 # use alignment to adjust x, y 349 # use alignment to adjust x, y
276 350
277 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
278 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
279
280 ($w, $h) = ($w2, $h2);
281 } 353 }
282 354
283 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
284 $self->{x} = $x; 356 $self->{x} = $x;
285 $self->{y} = $y; 357 $self->{y} = $y;
286 $self->update; 358 $self->update;
287 } 359 }
288 360
289 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
290 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 362 return unless $self->{visible};
363
364 $self->{alloc_w} = $w;
365 $self->{alloc_h} = $h;
366
367 $self->{root}{size_alloc}{$self+0} = $self;
291 } 368 }
292} 369}
293 370
294sub size_allocate { 371sub size_allocate {
295 # nothing to be done 372 # nothing to be done
296} 373}
297 374
298sub reconfigure {
299 my ($self) = @_;
300
301 $self->check_size (1);
302 $self->update;
303}
304
305sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
306} 381}
307 382
308sub set_max_size { 383sub set_max_size {
309 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
310 385
… …
312 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
313} 388}
314 389
315sub set_tooltip { 390sub set_tooltip {
316 my ($self, $tooltip) = @_; 391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
317 397
318 $self->{tooltip} = $tooltip; 398 $self->{tooltip} = $tooltip;
319 399
320 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
321 delete $CFClient::UI::TOOLTIP->{owner}; 401 delete $CFClient::UI::TOOLTIP->{owner};
… …
343 return if $FOCUS == $self; 423 return if $FOCUS == $self;
344 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
345 425
346 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
347 427
348 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
349 429
350 $focus->update if $focus; 430 $focus->update if $focus;
351 $FOCUS->update; 431 $FOCUS->update;
352} 432}
353 433
… …
356 436
357 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
358 438
359 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
360 440
361 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
362 442
363 $focus->update if $focus; #? 443 $focus->update if $focus; #?
364}
365 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
366sub mouse_motion { } 449sub mouse_motion { 0 }
367sub button_up { } 450sub button_up { 0 }
368sub key_down { } 451sub key_down { 0 }
369sub key_up { } 452sub key_up { 0 }
370 453
371sub button_down { 454sub button_down {
372 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
373 456
374 $self->focus_in; 457 $self->focus_in;
375}
376 458
377sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
378sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
379sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
380sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
381sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 463 my ($self, $x, $y) = @_;
464
465 return () unless $self->{can_events};
466
467 return $self
468 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
469 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
470
471 ()
472}
473
474sub set_parent {
475 my ($self, $parent) = @_;
476
477 Scalar::Util::weaken ($self->{parent} = $parent);
478 $self->set_visible if $parent->{visible};
479}
480
481sub connect {
482 my ($self, $signal, $cb) = @_;
483
484 push @{ $self->{signal_cb}{$signal} }, $cb;
485}
486
487sub _emit {
488 my ($self, $signal, @args) = @_;
489
490 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
491}
492
493sub emit {
494 my ($self, $signal, @args) = @_;
495
496 $self->_emit ($signal, @args)
497 || $self->$signal (@args);
498}
499
500sub visibility_change {
501 #my ($self, $visible) = @_;
502}
503
504sub realloc {
505 my ($self) = @_;
506
507 if ($self->{visible}) {
508 return if $self->{root}{realloc}{$self+0};
509
510 $self->{root}{realloc}{$self+0} = $self;
511 $self->{root}->update;
512 } else {
513 delete $self->{req_w};
514 delete $self->{req_h};
515 }
516}
517
518sub update {
519 my ($self) = @_;
520
521 $self->{parent}->update
522 if $self->{parent};
523}
524
525sub reconfigure {
526 my ($self) = @_;
527
528 $self->realloc;
529 $self->update;
530}
531
532# using global variables seems a bit hacky, but passing through all drawing
533# functions seems pointless.
534our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
382 535
383sub draw { 536sub draw {
384 my ($self) = @_; 537 my ($self) = @_;
385 538
386 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
387 550
388 glPushMatrix; 551 glPushMatrix;
389 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
390 $self->_draw;
391 glPopMatrix;
392 553
393 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
394 my ($x, $y) = @$self{qw(x y)};
395
396 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
397 glEnable GL_BLEND; 556 glEnable GL_BLEND;
398 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
399 glBegin GL_QUADS; 558 glBegin GL_QUADS;
400 glVertex $x , $y;
401 glVertex $x + $self->{w}, $y;
402 glVertex $x + $self->{w}, $y + $self->{h};
403 glVertex $x , $y + $self->{h};
404 glEnd;
405 glDisable GL_BLEND;
406 }
407
408 if ($ENV{PCLIENT_DEBUG}) {
409 glPushMatrix;
410 glColor 1, 1, 0, 1;
411 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
412 glBegin GL_LINE_LOOP;
413 glVertex 0 , 0; 559 glVertex 0 , 0;
414 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
415 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
416 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
417 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
418 glPopMatrix; 577 glPopMatrix;
419 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
420 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
421} 583}
422 584
423sub _draw { 585sub _draw {
424 my ($self) = @_; 586 my ($self) = @_;
425 587
426 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
427}
428
429sub find_widget {
430 my ($self, $x, $y) = @_;
431
432 return () unless $self->{can_events};
433
434 return $self
435 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
436 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
437
438 ()
439}
440
441sub set_parent {
442 my ($self, $parent) = @_;
443
444 Scalar::Util::weaken ($self->{parent} = $parent);
445
446 # TODO: req_w _does_change after ->reconfigure
447 $self->check_size
448 unless exists $self->{req_w};
449
450 $self->show;
451}
452
453sub check_size {
454 my ($self, $forced) = @_;
455
456 $self->{force_alloc} = 1 if $forced;
457 $CFClient::UI::ROOT->{check_size}{$self} = $self;
458}
459
460sub update {
461 my ($self) = @_;
462
463 $self->{parent}->update
464 if $self->{parent};
465}
466
467sub connect {
468 my ($self, $signal, $cb) = @_;
469
470 push @{ $self->{signal_cb}{$signal} }, $cb;
471}
472
473sub emit {
474 my ($self, $signal, @args) = @_;
475
476 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
477} 589}
478 590
479sub DESTROY { 591sub DESTROY {
480 my ($self) = @_; 592 my ($self) = @_;
481 593
… …
513 625
514 if ($color && (@$color < 4 || $color->[3])) { 626 if ($color && (@$color < 4 || $color->[3])) {
515 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
516 628
517 glEnable GL_BLEND; 629 glEnable GL_BLEND;
518 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
519 glColor @$color; 631 glColor_premultiply @$color;
520 632
521 glBegin GL_QUADS; 633 glBegin GL_QUADS;
522 glVertex 0 , 0; 634 glVertex 0 , 0;
523 glVertex 0 , $h; 635 glVertex 0 , $h;
524 glVertex $w, $h; 636 glVertex $w, $h;
… …
539 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
540 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
541} 653}
542 654
543sub size_request { 655sub size_request {
544 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
545} 659}
546 660
547sub draw { } 661sub draw { }
548 662
549############################################################################# 663#############################################################################
… …
553our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
554 668
555sub new { 669sub new {
556 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
557 671
558 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
559 673
560 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
561 children => [], 675 children => [],
562 can_events => 0, 676 can_events => 0,
563 %arg, 677 %arg,
564 ); 678 );
679
565 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
566 682
567 $self 683 $self
568} 684}
569 685
570sub add { 686sub add {
… …
578 $self->{children} = [ 694 $self->{children} = [
579 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
580 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
581 ]; 697 ];
582 698
583 $self->check_size (1); 699 $self->realloc;
584 $self->update;
585} 700}
586 701
587sub children { 702sub children {
588 @{ $_[0]{children} } 703 @{ $_[0]{children} }
589} 704}
… …
594 delete $child->{parent}; 709 delete $child->{parent};
595 $child->hide; 710 $child->hide;
596 711
597 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
598 713
599 $self->check_size; 714 $self->realloc;
600 $self->update;
601} 715}
602 716
603sub clear { 717sub clear {
604 my ($self) = @_; 718 my ($self) = @_;
605 719
… …
609 for (@$children) { 723 for (@$children) {
610 delete $_->{parent}; 724 delete $_->{parent};
611 $_->hide; 725 $_->hide;
612 } 726 }
613 727
614 $self->check_size; 728 $self->realloc;
615 $self->update;
616} 729}
617 730
618sub find_widget { 731sub find_widget {
619 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
620 733
621 $x -= $self->{x}; 734 $x -= $self->{x};
622 $y -= $self->{y}; 735 $y -= $self->{y};
623 736
624 my $res; 737 my $res;
625 738
626 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
627 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
628 and return $res; 741 and return $res;
629 } 742 }
630 743
631 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
680 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
681} 794}
682 795
683############################################################################# 796#############################################################################
684 797
798# back-buffered drawing area
799
685package CFClient::UI::Window; 800package CFClient::UI::Window;
686 801
687our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
688 803
689use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
707 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
708 $self->update; 823 $self->update;
709} 824}
710 825
711sub _render { 826sub _render {
827 my ($self) = @_;
828
712 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
713} 830}
714 831
715sub render_child { 832sub render_child {
716 my ($self) = @_; 833 my ($self) = @_;
717 834
718 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 835 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
719 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
720 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
721 838
839 {
840 package CFClient::UI::Base;
841
842 ($draw_x, $draw_y, $draw_w, $draw_h) =
843 (0, 0, $self->{w}, $self->{h});
844 }
845
722 $self->_render; 846 $self->_render;
723 }; 847 };
724} 848}
725 849
726sub _draw { 850sub _draw {
727 my ($self) = @_; 851 my ($self) = @_;
728 852
729 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
730 854
731 my $tex = $self->{texture} 855 my $tex = $self->{texture}
732 or return; 856 or return;
733 857
734 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
735 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
860 glEnable GL_BLEND;
861 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
736 glColor 1, 1, 1, 1; 862 glColor 0, 0, 0, 1;
737 863
738 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 864 $tex->draw_quad (0, 0, $w, $h);
739 865
866 glDisable GL_BLEND;
740 glDisable GL_TEXTURE_2D; 867 glDisable GL_TEXTURE_2D;
741} 868}
742 869
743############################################################################# 870#############################################################################
744 871
745package CFClient::UI::ViewPort; 872package CFClient::UI::ViewPort;
746 873
747our @ISA = CFClient::UI::Window::; 874our @ISA = CFClient::UI::Window::;
748 875
876sub new {
877 my $class = shift;
878
879 $class->SUPER::new (
880 scroll_x => 0,
881 scroll_y => 1,
882 @_,
883 )
884}
885
749sub size_request { 886sub size_request {
750 my ($self) = @_; 887 my ($self) = @_;
751 888
752 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 889 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
753 890
754 @$self{qw(child_w child_h)} 891 $w = 10 if $self->{scroll_x};
892 $h = 10 if $self->{scroll_y};
893
894 ($w, $h)
755} 895}
756 896
757sub size_allocate { 897sub size_allocate {
758 my ($self, $w, $h) = @_; 898 my ($self, $w, $h) = @_;
759 899
760 my ($cw, $ch) = @$self{qw(child_w child_h)}; 900 my $child = $self->child;
761# $w = $self->{w}; 901
902 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
903 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
904
762 $self->child->configure (0, 0, $cw, $ch); 905 $self->child->configure (0, 0, $w, $h);
763 $self->update; 906 $self->update;
764} 907}
765 908
766sub set_offset { 909sub set_offset {
767 my ($self, $x, $y) = @_; 910 my ($self, $x, $y) = @_;
… …
801} 944}
802 945
803sub _render { 946sub _render {
804 my ($self) = @_; 947 my ($self) = @_;
805 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
806 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 952 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
807 953
808 $self->SUPER::_render; 954 $self->SUPER::_render;
809} 955}
810 956
… …
813package CFClient::UI::ScrolledWindow; 959package CFClient::UI::ScrolledWindow;
814 960
815our @ISA = CFClient::UI::HBox::; 961our @ISA = CFClient::UI::HBox::;
816 962
817sub new { 963sub new {
818 my $class = shift; 964 my ($class, %arg) = @_;
965
966 my $child = delete $arg{child};
819 967
820 my $self; 968 my $self;
821 969
822 my $slider = new CFClient::UI::Slider 970 my $slider = new CFClient::UI::Slider
823 vertical => 1, 971 vertical => 1,
824 range => [0, 0, 1, 0.01], # HACK fix 972 range => [0, 0, 1, 0.01], # HACK fix
825 connect_changed => sub { 973 on_changed => sub {
826 $self->{vp}->set_offset (0, $_[1]); 974 $self->{vp}->set_offset (0, $_[1]);
827 }, 975 },
828 ; 976 ;
829 977
830 $self = $class->SUPER::new ( 978 $self = $class->SUPER::new (
831 vp => (new CFClient::UI::ViewPort expand => 1), 979 vp => (new CFClient::UI::ViewPort expand => 1),
832 slider => $slider, 980 slider => $slider,
833 @_, 981 %arg,
834 ); 982 );
835 983
836 $self->{vp}->add ($self->{scrolled});
837 $self->add ($self->{vp});
838 $self->add ($self->{slider}); 984 $self->SUPER::add ($self->{vp}, $self->{slider});
985 $self->add ($child) if $child;
839 986
840 $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]);
841} 1004}
842 1005
843sub size_allocate { 1006sub size_allocate {
844 my ($self, $w, $h) = @_; 1007 my ($self, $w, $h) = @_;
845 1008
… …
874 1037
875 if ($self->{bg}) { 1038 if ($self->{bg}) {
876 my ($w, $h) = @$self{qw(w h)}; 1039 my ($w, $h) = @$self{qw(w h)};
877 1040
878 glEnable GL_BLEND; 1041 glEnable GL_BLEND;
879 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1042 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
880 glColor @{ $self->{bg} }; 1043 glColor_premultiply @{ $self->{bg} };
881 1044
882 glBegin GL_QUADS; 1045 glBegin GL_QUADS;
883 glVertex 0 , 0; 1046 glVertex 0 , 0;
884 glVertex 0 , $h; 1047 glVertex 0 , $h;
885 glVertex $w, $h; 1048 glVertex $w, $h;
… …
898 1061
899our @ISA = CFClient::UI::Bin::; 1062our @ISA = CFClient::UI::Bin::;
900 1063
901use CFClient::OpenGL; 1064use CFClient::OpenGL;
902 1065
903my @tex = 1066my $bg =
1067 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1068 mipmap => 1, wrap => 1;
1069
1070my @border =
904 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1071 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
905 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);
906 1073
907sub new { 1074sub new {
908 my $class = shift; 1075 my ($class, %arg) = @_;
909 1076
910 # TODO: user_x, user_y, overwrite moveto? 1077 my $title = delete $arg{title};
911 1078
912 my $self = $class->SUPER::new ( 1079 my $self = $class->SUPER::new (
913 bg => [1, 1, 1, 1], 1080 bg => [1, 1, 1, 1],
914 border_bg => [1, 1, 1, 1], 1081 border_bg => [1, 1, 1, 1],
915 border => 0.6, 1082 border => 0.6,
916 is_toplevel => 1,
917 can_events => 1, 1083 can_events => 1,
918 @_ 1084 min_w => 16,
1085 min_h => 16,
1086 %arg,
919 ); 1087 );
920 1088
921 $self->{title} &&= new CFClient::UI::Label 1089 $self->{title} = new CFClient::UI::Label
922 align => 0, 1090 align => 0,
923 valign => 1, 1091 valign => 1,
924 text => $self->{title}, 1092 text => $title,
925 fontsize => $self->{border}; 1093 fontsize => $self->{border}
1094 if defined $title;
926 1095
927 $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};
928} 1104}
929 1105
930sub border { 1106sub border {
931 int $_[0]{border} * $::FONTSIZE 1107 int $_[0]{border} * $::FONTSIZE
932} 1108}
933 1109
934sub size_request { 1110sub size_request {
935 my ($self) = @_; 1111 my ($self) = @_;
1112
1113 $self->{title}->size_request
1114 if $self->{title};
936 1115
937 my ($w, $h) = $self->SUPER::size_request; 1116 my ($w, $h) = $self->SUPER::size_request;
938 1117
939 ( 1118 (
940 $w + $self->border * 2, 1119 $w + $self->border * 2,
… …
943} 1122}
944 1123
945sub size_allocate { 1124sub size_allocate {
946 my ($self, $w, $h) = @_; 1125 my ($self, $w, $h) = @_;
947 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
948 $h -= List::Util::max 0, $self->border * 2; 1135 $h -= List::Util::max 0, $border * 2;
949 $w -= List::Util::max 0, $self->border * 2; 1136 $w -= List::Util::max 0, $border * 2;
950 1137
951 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
952 if $self->{title};
953
954 $self->child->configure ($self->border, $self->border, $w, $h); 1138 $self->child->configure ($border, $border, $w, $h);
955} 1139}
956 1140
957sub button_down { 1141sub button_down {
958 my ($self, $ev, $x, $y) = @_; 1142 my ($self, $ev, $x, $y) = @_;
959 1143
… …
975 my ($ev, $x, $y) = @_; 1159 my ($ev, $x, $y) = @_;
976 1160
977 my $dx = $ev->{x} - $ox; 1161 my $dx = $ev->{x} - $ox;
978 my $dy = $ev->{y} - $oy; 1162 my $dy = $ev->{y} - $oy;
979 1163
980 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1164 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
981 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1165 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1166
982 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1167 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
983 $self->check_size; 1168 $self->realloc;
984 }; 1169 };
985 1170
986 } elsif ($lr ^ $td) { 1171 } elsif ($lr ^ $td) {
987 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1172 my ($ox, $oy) = ($ev->{x}, $ev->{y});
988 my ($bx, $by) = ($self->{x}, $self->{y}); 1173 my ($bx, $by) = ($self->{x}, $self->{y});
… …
990 $self->{motion} = sub { 1175 $self->{motion} = sub {
991 my ($ev, $x, $y) = @_; 1176 my ($ev, $x, $y) = @_;
992 1177
993 ($x, $y) = ($ev->{x}, $ev->{y}); 1178 ($x, $y) = ($ev->{x}, $ev->{y});
994 1179
995 $self->move ($bx + $x - $ox, $by + $y - $oy); 1180 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
996 $self->update; 1181 # HACK: the next line is required to enforce placement
1182 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
997 }; 1183 };
1184 } else {
1185 return 0;
1186 }
1187
998 } 1188 1
999} 1189}
1000 1190
1001sub button_up { 1191sub button_up {
1002 my ($self, $ev, $x, $y) = @_; 1192 my ($self, $ev, $x, $y) = @_;
1003 1193
1004 delete $self->{motion}; 1194 !!delete $self->{motion}
1005} 1195}
1006 1196
1007sub mouse_motion { 1197sub mouse_motion {
1008 my ($self, $ev, $x, $y) = @_; 1198 my ($self, $ev, $x, $y) = @_;
1009 1199
1010 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1200 $self->{motion}->($ev, $x, $y) if $self->{motion};
1201
1202 !!$self->{motion}
1011} 1203}
1012 1204
1013sub _draw { 1205sub _draw {
1014 my ($self) = @_; 1206 my ($self) = @_;
1015 1207
1208 my $child = $self->{children}[0];
1209
1016 my ($w, $h ) = ($self->{w}, $self->{h}); 1210 my ($w, $h ) = ($self->{w}, $self->{h});
1017 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1211 my ($cw, $ch) = ($child->{w}, $child->{h});
1018 1212
1019 glEnable GL_TEXTURE_2D; 1213 glEnable GL_TEXTURE_2D;
1020 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1214 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1021 1215
1022 my $border = $self->border; 1216 my $border = $self->border;
1023 1217
1024 glColor @{ $self->{border_bg} }; 1218 glColor @{ $self->{border_bg} };
1025 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1219 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1026 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1220 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1027 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1221 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1028 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1222 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1029 1223
1030 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1224 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1031 my $bg = $tex[0]; 1225 glColor @{ $self->{bg} };
1032 1226
1033 # TODO: repeat texture not scale 1227 # TODO: repeat texture not scale
1228 # solve this better(?)
1034 my $rep_x = $cw / $bg->{w}; 1229 $bg->{s} = $cw / $bg->{w};
1035 my $rep_y = $ch / $bg->{h}; 1230 $bg->{t} = $ch / $bg->{h};
1036
1037 glColor @{ $self->{bg} };
1038
1039 $bg->{s} = $rep_x;
1040 $bg->{t} = $rep_y;
1041 $bg->{wrap_mode} = 1;
1042 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1231 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1043 } 1232 }
1044 1233
1045 glDisable GL_TEXTURE_2D; 1234 glDisable GL_TEXTURE_2D;
1046 1235
1047 $self->{title}->draw if $self->{title};
1048
1049 $self->child->draw; 1236 $child->draw;
1237
1238 if ($self->{title}) {
1239 glTranslate 0, $border - $self->{h};
1240 $self->{title}->_draw;
1241 }
1050} 1242}
1051 1243
1052############################################################################# 1244#############################################################################
1053 1245
1054package CFClient::UI::Table; 1246package CFClient::UI::Table;
… …
1062sub new { 1254sub new {
1063 my $class = shift; 1255 my $class = shift;
1064 1256
1065 $class->SUPER::new ( 1257 $class->SUPER::new (
1066 col_expand => [], 1258 col_expand => [],
1067 @_ 1259 @_,
1068 ) 1260 )
1261}
1262
1263sub children {
1264 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1069} 1265}
1070 1266
1071sub add { 1267sub add {
1072 my ($self, $x, $y, $child) = @_; 1268 my ($self, $x, $y, $child) = @_;
1073 1269
1074 $child->set_parent ($self); 1270 $child->set_parent ($self);
1075 $self->{children}[$y][$x] = $child; 1271 $self->{children}[$y][$x] = $child;
1076 1272
1077 $child->check_size; 1273 $self->realloc;
1078} 1274}
1079 1275
1080sub children {
1081 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1082}
1083
1084# 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?
1085sub clear { 1277sub clear {
1086 my ($self) = @_; 1278 my ($self) = @_;
1087 1279
1088 my @children = $self->children; 1280 my @children = $self->children;
1089 delete $self->{children}; 1281 delete $self->{children};
… …
1091 for (@children) { 1283 for (@children) {
1092 delete $_->{parent}; 1284 delete $_->{parent};
1093 $_->hide; 1285 $_->hide;
1094 } 1286 }
1095 1287
1096 $self->update; 1288 $self->realloc;
1097} 1289}
1098 1290
1099sub get_wh { 1291sub get_wh {
1100 my ($self) = @_; 1292 my ($self) = @_;
1101 1293
… …
1132sub size_allocate { 1324sub size_allocate {
1133 my ($self, $w, $h) = @_; 1325 my ($self, $w, $h) = @_;
1134 1326
1135 my ($ws, $hs) = $self->get_wh; 1327 my ($ws, $hs) = $self->get_wh;
1136 1328
1137 my $req_w = sum @$ws; 1329 my $req_w = (sum @$ws) || 1;
1138 my $req_h = sum @$hs; 1330 my $req_h = (sum @$hs) || 1;
1139 1331
1140 # TODO: nicer code && do row_expand 1332 # TODO: nicer code && do row_expand
1141 my @col_expand = @{$self->{col_expand}}; 1333 my @col_expand = @{$self->{col_expand}};
1142 @col_expand = (1) x @$ws unless @col_expand; 1334 @col_expand = (1) x @$ws unless @col_expand;
1143 my $col_expand = (sum @col_expand) || 1; 1335 my $col_expand = (sum @col_expand) || 1;
… …
1197 } 1389 }
1198} 1390}
1199 1391
1200############################################################################# 1392#############################################################################
1201 1393
1202package CFClient::UI::HBox; 1394package CFClient::UI::Box;
1203
1204# TODO: wrap into common Box base class
1205 1395
1206our @ISA = CFClient::UI::Container::; 1396our @ISA = CFClient::UI::Container::;
1207 1397
1208sub size_request { 1398sub size_request {
1209 my ($self) = @_; 1399 my ($self) = @_;
1210 1400
1211 my @alloc = map [$_->size_request], @{$self->{children}}; 1401 $self->{vertical}
1212 1402 ? (
1213 ( 1403 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1214 (List::Util::sum map $_->[0], @alloc), 1404 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1215 (List::Util::max map $_->[1], @alloc), 1405 )
1216 ) 1406 : (
1407 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1408 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1409 )
1217} 1410}
1218 1411
1219sub size_allocate { 1412sub size_allocate {
1220 my ($self, $w, $h) = @_; 1413 my ($self, $w, $h) = @_;
1221 1414
1222 ($h, $w) = ($w, $h); 1415 my $space = $self->{vertical} ? $h : $w;
1223
1224 my $children = $self->{children}; 1416 my $children = $self->{children};
1225 1417
1226 my @h = map $_->{req_w}, @$children; 1418 my @req;
1227 1419
1228 my $req_h = List::Util::sum @h; 1420 if ($self->{homogeneous}) {
1229 1421 @req = ($space / (@$children || 1)) x @$children;
1230 if ($req_h > $h) {
1231 # ah well, not enough space
1232 $_ *= $h / $req_h for @h;
1233 } 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 {
1234 my $exp = List::Util::sum map $_->{expand}, @$children; 1430 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1235 $exp ||= 1;
1236 1431
1432 $space = ($space - $req) / $expand; # remaining space to give away
1433
1434 $req[$_] += $space * $children->[$_]{expand}
1237 for (0 .. $#$children) { 1435 for 0 .. $#$children;
1238 my $child = $children->[$_];
1239
1240 my $alloc_h = $h[$_];
1241 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1242 $h[$_] = $alloc_h;
1243 } 1436 }
1244 } 1437 }
1245 1438
1246 CFClient::UI::harmonize \@h; 1439 CFClient::UI::harmonize \@req;
1247 1440
1248 my $y = 0; 1441 my $pos = 0;
1249 for (0 .. $#$children) { 1442 for (0 .. $#$children) {
1250 my $child = $children->[$_];
1251 my $h = $h[$_]; 1443 my $alloc = $req[$_];
1252 $child->configure ($y, 0, $h, $w); 1444 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1253 1445
1254 $y += $h; 1446 $pos += $alloc;
1255 } 1447 }
1256 1448
1257 1 1449 1
1258} 1450}
1259 1451
1260############################################################################# 1452#############################################################################
1261 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
1262package CFClient::UI::VBox; 1469package CFClient::UI::VBox;
1263 1470
1264# TODO: wrap into common Box base class
1265
1266our @ISA = CFClient::UI::Container::; 1471our @ISA = CFClient::UI::Box::;
1267 1472
1268sub size_request { 1473sub new {
1269 my ($self) = @_; 1474 my $class = shift;
1270 1475
1271 my @alloc = map [$_->size_request], @{$self->{children}}; 1476 $class->SUPER::new (
1272 1477 vertical => 1,
1273 ( 1478 @_,
1274 (List::Util::max map $_->[0], @alloc),
1275 (List::Util::sum map $_->[1], @alloc),
1276 ) 1479 )
1277}
1278
1279sub size_allocate {
1280 my ($self, $w, $h) = @_;
1281
1282 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1283
1284 my $children = $self->{children};
1285
1286 my @h = map $_->{req_h}, @$children;
1287
1288 my $req_h = List::Util::sum @h;
1289
1290 if ($req_h > $h) {
1291 # ah well, not enough space
1292 $_ *= $h / $req_h for @h;
1293 } else {
1294 my $exp = List::Util::sum map $_->{expand}, @$children;
1295 $exp ||= 1;
1296
1297 for (0 .. $#$children) {
1298 my $child = $children->[$_];
1299
1300 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1301 }
1302 }
1303
1304 CFClient::UI::harmonize \@h;
1305
1306 my $y = 0;
1307 for (0 .. $#$children) {
1308 my $child = $children->[$_];
1309 my $h = $h[$_];
1310 $child->configure (0, $y, $w, $h);
1311
1312 $y += $h;
1313 }
1314
1315 1
1316} 1480}
1317 1481
1318############################################################################# 1482#############################################################################
1319 1483
1320package CFClient::UI::Label; 1484package CFClient::UI::Label;
… …
1337 ellipsise => 3, # end 1501 ellipsise => 3, # end
1338 layout => (new CFClient::Layout), 1502 layout => (new CFClient::Layout),
1339 fontsize => 1, 1503 fontsize => 1,
1340 align => -1, 1504 align => -1,
1341 valign => -1, 1505 valign => -1,
1342 padding => 2, 1506 padding_x => 2,
1507 padding_y => 2,
1343 can_events => 0, 1508 can_events => 0,
1344 %arg 1509 %arg
1345 ); 1510 );
1346 1511
1347 if (exists $self->{template}) { 1512 if (exists $self->{template}) {
… …
1383 $self->{text} = "T$text"; 1548 $self->{text} = "T$text";
1384 1549
1385 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1550 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1386 $self->{layout}->set_text ($text); 1551 $self->{layout}->set_text ($text);
1387 1552
1553 $self->realloc;
1388 $self->update; 1554 $self->update;
1389 $self->check_size;
1390} 1555}
1391 1556
1392sub set_markup { 1557sub set_markup {
1393 my ($self, $markup) = @_; 1558 my ($self, $markup) = @_;
1394 1559
… …
1398 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1563 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1399 1564
1400 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1565 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1401 $self->{layout}->set_markup ($markup); 1566 $self->{layout}->set_markup ($markup);
1402 1567
1568 $self->realloc;
1403 $self->update; 1569 $self->update;
1404 $self->check_size;
1405} 1570}
1406 1571
1407sub size_request { 1572sub size_request {
1408 my ($self) = @_; 1573 my ($self) = @_;
1409 1574
… …
1423 1588
1424 $w = List::Util::max $w, $w2; 1589 $w = List::Util::max $w, $w2;
1425 $h = List::Util::max $h, $h2; 1590 $h = List::Util::max $h, $h2;
1426 } 1591 }
1427 1592
1428 ( 1593 ($w, $h)
1429 $w + $self->{padding} * 2,
1430 $h + $self->{padding} * 2,
1431 )
1432} 1594}
1433 1595
1434sub size_allocate { 1596sub size_allocate {
1435 my ($self, $w, $h) = @_; 1597 my ($self, $w, $h) = @_;
1436 1598
1599 delete $self->{ox};
1600
1437 delete $self->{texture}; 1601 delete $self->{texture}
1602 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1438} 1603}
1439 1604
1440sub set_fontsize { 1605sub set_fontsize {
1441 my ($self, $fontsize) = @_; 1606 my ($self, $fontsize) = @_;
1442 1607
1443 $self->{fontsize} = $fontsize; 1608 $self->{fontsize} = $fontsize;
1444 delete $self->{texture}; 1609 delete $self->{texture};
1445 1610
1446 $self->update; 1611 $self->realloc;
1447 $self->check_size;
1448} 1612}
1449 1613
1450sub _draw { 1614sub _draw {
1451 my ($self) = @_; 1615 my ($self) = @_;
1452 1616
… …
1458 $self->{layout}->set_width ($self->{w}); 1622 $self->{layout}->set_width ($self->{w});
1459 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1623 $self->{layout}->set_ellipsise ($self->{ellipsise});
1460 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1624 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1461 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1625 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1462 1626
1463 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1627 new_from_layout CFClient::Texture $self->{layout}
1628 };
1464 1629
1630 unless (exists $self->{ox}) {
1465 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1631 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1466 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1632 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1467 : ($self->{w} - $tex->{w}) * 0.5); 1633 : ($self->{w} - $tex->{w}) * 0.5);
1468 1634
1469 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1635 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1470 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1636 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1471 : ($self->{h} - $tex->{h}) * 0.5); 1637 : ($self->{h} - $tex->{h}) * 0.5);
1472
1473 $tex
1474 }; 1638 };
1475 1639
1476 glEnable GL_TEXTURE_2D; 1640 glEnable GL_TEXTURE_2D;
1477 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1478 1642
… …
1516 1680
1517 delete $self->{cur_h}; 1681 delete $self->{cur_h};
1518 1682
1519 return if $self->{text} eq $text; 1683 return if $self->{text} eq $text;
1520 1684
1521 delete $self->{texture};
1522
1523 $self->{last_activity} = $::NOW; 1685 $self->{last_activity} = $::NOW;
1524 $self->{text} = $text; 1686 $self->{text} = $text;
1525 1687
1526 $text =~ s/./*/g if $self->{hidden}; 1688 $text =~ s/./*/g if $self->{hidden};
1527 $self->{layout}->set_text ("$text "); 1689 $self->{layout}->set_text ("$text ");
1528 1690
1529 $self->emit (changed => $self->{text}); 1691 $self->_emit (changed => $self->{text});
1692 $self->update;
1530} 1693}
1531 1694
1532sub set_text { 1695sub set_text {
1533 my ($self, $text) = @_; 1696 my ($self, $text) = @_;
1534 1697
1535 $self->{cursor} = length $text; 1698 $self->{cursor} = length $text;
1536 $self->_set_text ($text); 1699 $self->_set_text ($text);
1537 $self->update; 1700
1538 $self->check_size; 1701 $self->realloc;
1539} 1702}
1540 1703
1541sub get_text { 1704sub get_text {
1542 $_[0]{text} 1705 $_[0]{text}
1543} 1706}
… …
1546 my ($self) = @_; 1709 my ($self) = @_;
1547 1710
1548 my ($w, $h) = $self->SUPER::size_request; 1711 my ($w, $h) = $self->SUPER::size_request;
1549 1712
1550 ($w + 1, $h) # add 1 for cursor 1713 ($w + 1, $h) # add 1 for cursor
1551}
1552
1553sub size_allocate {
1554 my ($self, $w, $h) = @_;
1555
1556 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1557} 1714}
1558 1715
1559sub key_down { 1716sub key_down {
1560 my ($self, $ev) = @_; 1717 my ($self, $ev) = @_;
1561 1718
… …
1576 } elsif ($sym == CFClient::SDLK_HOME) { 1733 } elsif ($sym == CFClient::SDLK_HOME) {
1577 $self->{cursor} = 0; 1734 $self->{cursor} = 0;
1578 } elsif ($sym == CFClient::SDLK_END) { 1735 } elsif ($sym == CFClient::SDLK_END) {
1579 $self->{cursor} = length $text; 1736 $self->{cursor} = length $text;
1580 } elsif ($uni == 27) { 1737 } elsif ($uni == 27) {
1581 $self->emit ('escape'); 1738 $self->_emit ('escape');
1582 } elsif ($uni) { 1739 } elsif ($uni) {
1583 substr $text, $self->{cursor}++, 0, chr $uni; 1740 substr $text, $self->{cursor}++, 0, chr $uni;
1741 } else {
1742 return 0;
1584 } 1743 }
1585 1744
1586 $self->_set_text ($text); 1745 $self->_set_text ($text);
1587 $self->update; 1746
1588 $self->check_size; 1747 $self->realloc;
1748
1749 1
1589} 1750}
1590 1751
1591sub focus_in { 1752sub focus_in {
1592 my ($self) = @_; 1753 my ($self) = @_;
1593 1754
… …
1608 utf8::encode $text; 1769 utf8::encode $text;
1609 $self->{cursor} = length substr $text, 0, $idx; 1770 $self->{cursor} = length substr $text, 0, $idx;
1610 1771
1611 $self->_set_text ($self->{text}); 1772 $self->_set_text ($self->{text});
1612 $self->update; 1773 $self->update;
1774
1775 1
1613} 1776}
1614 1777
1615sub mouse_motion { 1778sub mouse_motion {
1616 my ($self, $ev, $x, $y) = @_; 1779 my ($self, $ev, $x, $y) = @_;
1617# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1780# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1781
1782 0
1618} 1783}
1619 1784
1620sub _draw { 1785sub _draw {
1621 my ($self) = @_; 1786 my ($self) = @_;
1622 1787
1623 local $self->{fg} = $self->{fg}; 1788 local $self->{fg} = $self->{fg};
1624 1789
1625 if ($FOCUS == $self) { 1790 if ($FOCUS == $self) {
1626 glColor @{$self->{active_bg}}; 1791 glColor_premultiply @{$self->{active_bg}};
1627 $self->{fg} = $self->{active_fg}; 1792 $self->{fg} = $self->{active_fg};
1628 } else { 1793 } else {
1629 glColor @{$self->{bg}}; 1794 glColor_premultiply @{$self->{bg}};
1630 } 1795 }
1631 1796
1632 glEnable GL_BLEND; 1797 glEnable GL_BLEND;
1633 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1798 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1634 glBegin GL_QUADS; 1799 glBegin GL_QUADS;
1635 glVertex 0 , 0; 1800 glVertex 0 , 0;
1636 glVertex 0 , $self->{h}; 1801 glVertex 0 , $self->{h};
1637 glVertex $self->{w}, $self->{h}; 1802 glVertex $self->{w}, $self->{h};
1638 glVertex $self->{w}, 0; 1803 glVertex $self->{w}, 0;
… …
1673 if ($sym == 13) { 1838 if ($sym == 13) {
1674 unshift @{$self->{history}}, 1839 unshift @{$self->{history}},
1675 my $txt = $self->get_text; 1840 my $txt = $self->get_text;
1676 $self->{history_pointer} = -1; 1841 $self->{history_pointer} = -1;
1677 $self->{history_saveback} = ''; 1842 $self->{history_saveback} = '';
1678 $self->emit (activate => $txt); 1843 $self->_emit (activate => $txt);
1679 $self->update; 1844 $self->update;
1680 1845
1681 } elsif ($sym == CFClient::SDLK_UP) { 1846 } elsif ($sym == CFClient::SDLK_UP) {
1682 if ($self->{history_pointer} < 0) { 1847 if ($self->{history_pointer} < 0) {
1683 $self->{history_saveback} = $self->get_text; 1848 $self->{history_saveback} = $self->get_text;
… …
1699 } else { 1864 } else {
1700 $self->set_text ($self->{history_saveback}); 1865 $self->set_text ($self->{history_saveback});
1701 } 1866 }
1702 1867
1703 } else { 1868 } else {
1704 $self->SUPER::key_down ($ev); 1869 return $self->SUPER::key_down ($ev)
1870 }
1871
1705 } 1872 1
1706
1707} 1873}
1708 1874
1709############################################################################# 1875#############################################################################
1710 1876
1711package CFClient::UI::Button; 1877package CFClient::UI::Button;
… …
1720 1886
1721sub new { 1887sub new {
1722 my $class = shift; 1888 my $class = shift;
1723 1889
1724 $class->SUPER::new ( 1890 $class->SUPER::new (
1725 padding => 4, 1891 padding_x => 4,
1892 padding_y => 4,
1726 fg => [1, 1, 1], 1893 fg => [1, 1, 1],
1727 active_fg => [0, 0, 1], 1894 active_fg => [0, 0, 1],
1728 can_hover => 1, 1895 can_hover => 1,
1729 align => 0, 1896 align => 0,
1730 valign => 0, 1897 valign => 0,
1731 can_events => 1, 1898 can_events => 1,
1732 @_ 1899 @_
1733 ) 1900 )
1734} 1901}
1735 1902
1903sub activate { }
1904
1736sub button_up { 1905sub button_up {
1737 my ($self, $ev, $x, $y) = @_; 1906 my ($self, $ev, $x, $y) = @_;
1738 1907
1908 $self->emit ("activate")
1739 if ($x >= 0 && $x < $self->{w} 1909 if $x >= 0 && $x < $self->{w}
1740 && $y >= 0 && $y < $self->{h}) { 1910 && $y >= 0 && $y < $self->{h};
1741 $self->emit ("activate"); 1911
1742 } 1912 1
1743} 1913}
1744 1914
1745sub _draw { 1915sub _draw {
1746 my ($self) = @_; 1916 my ($self) = @_;
1747 1917
… …
1776 1946
1777sub new { 1947sub new {
1778 my $class = shift; 1948 my $class = shift;
1779 1949
1780 $class->SUPER::new ( 1950 $class->SUPER::new (
1781 padding => 2, 1951 padding_x => 2,
1952 padding_y => 2,
1782 fg => [1, 1, 1], 1953 fg => [1, 1, 1],
1783 active_fg => [1, 1, 0], 1954 active_fg => [1, 1, 0],
1784 bg => [0, 0, 0, 0.2], 1955 bg => [0, 0, 0, 0.2],
1785 active_bg => [1, 1, 1, 0.5], 1956 active_bg => [1, 1, 1, 0.5],
1786 state => 0, 1957 state => 0,
… …
1790} 1961}
1791 1962
1792sub size_request { 1963sub size_request {
1793 my ($self) = @_; 1964 my ($self) = @_;
1794 1965
1795 ($self->{padding} * 2 + 6) x 2 1966 (6) x 2
1796} 1967}
1797 1968
1798sub button_down { 1969sub button_down {
1799 my ($self, $ev, $x, $y) = @_; 1970 my ($self, $ev, $x, $y) = @_;
1800 1971
1801 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1972 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1802 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1973 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1803 $self->{state} = !$self->{state}; 1974 $self->{state} = !$self->{state};
1804 $self->emit (changed => $self->{state}); 1975 $self->_emit (changed => $self->{state});
1976 } else {
1977 return 0
1978 }
1979
1805 } 1980 1
1806} 1981}
1807 1982
1808sub _draw { 1983sub _draw {
1809 my ($self) = @_; 1984 my ($self) = @_;
1810 1985
1811 $self->SUPER::_draw; 1986 $self->SUPER::_draw;
1812 1987
1813 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1988 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1814 1989
1815 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1990 my ($w, $h) = @$self{qw(w h)};
1991
1992 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1816 1993
1817 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1994 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1818 1995
1819 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1996 my $tex = $self->{state} ? $tex[1] : $tex[0];
1820 1997
… …
1975 2152
1976 my $h1 = $self->{h} * (1 - $ycut1); 2153 my $h1 = $self->{h} * (1 - $ycut1);
1977 my $h2 = $self->{h} * (1 - $ycut2); 2154 my $h2 = $self->{h} * (1 - $ycut2);
1978 2155
1979 glEnable GL_BLEND; 2156 glEnable GL_BLEND;
1980 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2157 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2158 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1981 glEnable GL_TEXTURE_2D; 2159 glEnable GL_TEXTURE_2D;
1982 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1983 2161
1984 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2162 glBindTexture GL_TEXTURE_2D, $t1->{name};
1985 glBegin GL_QUADS; 2163 glBegin GL_QUADS;
… …
2085 fg => [1, 1, 1], 2263 fg => [1, 1, 1],
2086 active_fg => [0, 0, 0], 2264 active_fg => [0, 0, 0],
2087 bg => [0, 0, 0, 0.2], 2265 bg => [0, 0, 0, 0.2],
2088 active_bg => [1, 1, 1, 0.5], 2266 active_bg => [1, 1, 1, 0.5],
2089 range => [0, 0, 100, 10, 0], 2267 range => [0, 0, 100, 10, 0],
2090 req_w => $::WIDTH / 80, 2268 min_w => $::WIDTH / 80,
2091 req_h => $::WIDTH / 80, 2269 min_h => $::WIDTH / 80,
2092 vertical => 0, 2270 vertical => 0,
2093 can_hover => 1, 2271 can_hover => 1,
2094 inner_pad => 0.02, 2272 inner_pad => 0.02,
2095 @_ 2273 @_
2096 ); 2274 );
… …
2099 $self->update; 2277 $self->update;
2100 2278
2101 $self 2279 $self
2102} 2280}
2103 2281
2282sub changed { }
2283
2104sub set_range { 2284sub set_range {
2105 my ($self, $range) = @_; 2285 my ($self, $range) = @_;
2106 2286
2107 $self->{range} = $range; 2287 ($range, $self->{range}) = ($self->{range}, $range);
2108 2288
2109 $self->update; 2289 $self->update
2290 if "@$range" ne "@{$self->{range}}";
2110} 2291}
2111 2292
2112sub set_value { 2293sub set_value {
2113 my ($self, $value) = @_; 2294 my ($self, $value) = @_;
2114 2295
… …
2125 if $unit; 2306 if $unit;
2126 2307
2127 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2308 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2128 2309
2129 if ($value != $old_value) { 2310 if ($value != $old_value) {
2130 $self->emit (changed => $value); 2311 $self->_emit (changed => $value);
2131 $self->update; 2312 $self->update;
2132 } 2313 }
2133} 2314}
2134 2315
2135sub size_request { 2316sub size_request {
2136 my ($self) = @_; 2317 my ($self) = @_;
2137 2318
2138 my $w = $self->{req_w}; 2319 ($self->{req_w}, $self->{req_h})
2139 my $h = $self->{req_h};
2140
2141 $self->{vertical} ? ($h, $w) : ($w, $h)
2142} 2320}
2143 2321
2144sub button_down { 2322sub button_down {
2145 my ($self, $ev, $x, $y) = @_; 2323 my ($self, $ev, $x, $y) = @_;
2146 2324
2147 $self->SUPER::button_down ($ev, $x, $y); 2325 $self->SUPER::button_down ($ev, $x, $y);
2148 2326
2149 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 2327 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2150 2328
2151 $self->mouse_motion ($ev, $x, $y); 2329 $self->mouse_motion ($ev, $x, $y)
2152} 2330}
2153 2331
2154sub mouse_motion { 2332sub mouse_motion {
2155 my ($self, $ev, $x, $y) = @_; 2333 my ($self, $ev, $x, $y) = @_;
2156 2334
… …
2160 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2338 my (undef, $lo, $hi, $page) = @{$self->{range}};
2161 2339
2162 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 2340 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2163 2341
2164 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 2342 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2343 } else {
2344 return 0;
2345 }
2346
2165 } 2347 1
2166} 2348}
2167 2349
2168sub update { 2350sub update {
2169 my ($self) = @_; 2351 my ($self) = @_;
2170 2352
2171 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2353 delete $self->{knob_w};
2354 $self->SUPER::update;
2355}
2356
2357sub _draw {
2358 my ($self) = @_;
2359
2360 unless ($self->{knob_w}) {
2172 $self->set_value ($self->{range}[0]); 2361 $self->set_value ($self->{range}[0]);
2173 2362
2174 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2363 my ($value, $lo, $hi, $page) = @{$self->{range}};
2175 my $range = ($hi - $page - $lo) || 1e-100; 2364 my $range = ($hi - $page - $lo) || 1e-100;
2176 2365
… …
2182 $value = ($value - $lo) / $range; 2371 $value = ($value - $lo) / $range;
2183 $value = $value * $self->{scale} + $self->{offset}; 2372 $value = $value * $self->{scale} + $self->{offset};
2184 2373
2185 $self->{knob_x} = $value - $knob_w * 0.5; 2374 $self->{knob_x} = $value - $knob_w * 0.5;
2186 $self->{knob_w} = $knob_w; 2375 $self->{knob_w} = $knob_w;
2187 }); 2376 }
2188
2189 $self->SUPER::update;
2190}
2191
2192sub _draw {
2193 my ($self) = @_;
2194 2377
2195 $self->SUPER::_draw (); 2378 $self->SUPER::_draw ();
2196 2379
2197 glScale $self->{w}, $self->{h}; 2380 glScale $self->{w}, $self->{h};
2198 2381
… …
2497 2680
2498sub new { 2681sub new {
2499 my $class = shift; 2682 my $class = shift;
2500 2683
2501 my $self = $class->SUPER::new ( 2684 my $self = $class->SUPER::new (
2502 state => 0, 2685 state => 0,
2503 connect_activate => \&toggle_flopper, 2686 on_activate => \&toggle_flopper,
2504 @_ 2687 @_
2505 ); 2688 );
2506 2689
2507 if ($self->{state}) {
2508 $self->{state} = 0;
2509 $self->toggle_flopper;
2510 }
2511
2512 $self 2690 $self
2513} 2691}
2514 2692
2515sub toggle_flopper { 2693sub toggle_flopper {
2516 my ($self) = @_; 2694 my ($self) = @_;
2517 2695
2518 # TODO: use animation 2696 $self->{other}->toggle_visibility;
2519 if ($self->{state} = !$self->{state}) {
2520 $CFClient::UI::ROOT->add ($self->{other});
2521 $self->{other}->move ($self->coord2global (0, $self->{h}));
2522 $self->emit ("open");
2523 } else {
2524 $CFClient::UI::ROOT->remove ($self->{other});
2525 $self->emit ("close");
2526 }
2527
2528 $self->emit (changed => $self->{state});
2529} 2697}
2530 2698
2531############################################################################# 2699#############################################################################
2532 2700
2533package CFClient::UI::Tooltip; 2701package CFClient::UI::Tooltip;
… …
2546} 2714}
2547 2715
2548sub set_tooltip_from { 2716sub set_tooltip_from {
2549 my ($self, $widget) = @_; 2717 my ($self, $widget) = @_;
2550 2718
2719 my $tooltip = $widget->{tooltip};
2720
2721 if ($ENV{CFPLUS_DEBUG} & 2) {
2722 $tooltip .= "\n\n" . (ref $widget) . "\n"
2723 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2724 . "req $widget->{req_w} $widget->{req_h}\n"
2725 . "visible $widget->{visible}";
2726 }
2727
2551 $self->add (new CFClient::UI::Label 2728 $self->add (new CFClient::UI::Label
2552 markup => $widget->{tooltip}, 2729 markup => $tooltip,
2553 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2730 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2554 fontsize => 0.8, 2731 fontsize => 0.8,
2555 fg => [0, 0, 0, 1], 2732 fg => [0, 0, 0, 1],
2556 ellipsise => 0, 2733 ellipsise => 0,
2557 font => ($widget->{tooltip_font} || $::FONT_PROP), 2734 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2568 2745
2569sub size_allocate { 2746sub size_allocate {
2570 my ($self, $w, $h) = @_; 2747 my ($self, $w, $h) = @_;
2571 2748
2572 $self->SUPER::size_allocate ($w - 4, $h - 4); 2749 $self->SUPER::size_allocate ($w - 4, $h - 4);
2750}
2751
2752sub visibility_change {
2753 my ($self, $visible) = @_;
2754
2755 return unless $visible;
2756
2757 $self->{root}->on_post_alloc ("move_$self" => sub {
2758 my $widget = $self->{owner}
2759 or return;
2760
2761 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2762
2763 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2764 if $x + $self->{w} > $::WIDTH;
2765
2766 $self->move_abs ($x, $y);
2767 });
2573} 2768}
2574 2769
2575sub _draw { 2770sub _draw {
2576 my ($self) = @_; 2771 my ($self) = @_;
2577 2772
… …
2594 glVertex $w, $h; 2789 glVertex $w, $h;
2595 glVertex $w, 0; 2790 glVertex $w, 0;
2596 glEnd; 2791 glEnd;
2597 2792
2598 glTranslate 2 - 0.375, 2 - 0.375; 2793 glTranslate 2 - 0.375, 2 - 0.375;
2794
2599 $self->SUPER::_draw; 2795 $self->SUPER::_draw;
2600} 2796}
2601 2797
2602############################################################################# 2798#############################################################################
2603 2799
… …
2609 2805
2610sub new { 2806sub new {
2611 my $class = shift; 2807 my $class = shift;
2612 2808
2613 my $self = $class->SUPER::new ( 2809 my $self = $class->SUPER::new (
2614 aspect => 1, 2810 aspect => 1,
2811 can_events => 0,
2615 @_, 2812 @_,
2616 ); 2813 );
2617 2814
2618 if ($self->{anim} && $self->{animspeed}) { 2815 if ($self->{anim} && $self->{animspeed}) {
2619 Scalar::Util::weaken (my $widget = $self); 2816 Scalar::Util::weaken (my $widget = $self);
… …
2678 $self->SUPER::DESTROY; 2875 $self->SUPER::DESTROY;
2679} 2876}
2680 2877
2681############################################################################# 2878#############################################################################
2682 2879
2683package CFClient::UI::InventoryItem; 2880package CFClient::UI::Buttonbar;
2684 2881
2685our @ISA = CFClient::UI::HBox::; 2882our @ISA = CFClient::UI::HBox::;
2686 2883
2687sub _item_to_desc { 2884# TODO: should actualyl wrap buttons and other goodies.
2688 my ($item) = @_;
2689
2690 my $desc =
2691 $item->{nrof} < 2
2692 ? $item->{name}
2693 : "$item->{nrof} × $item->{name_pl}";
2694
2695 $item->{flags} & Crossfire::Protocol::F_OPEN
2696 and $desc .= " (open)";
2697 $item->{flags} & Crossfire::Protocol::F_APPLIED
2698 and $desc .= " (applied)";
2699 $item->{flags} & Crossfire::Protocol::F_UNPAID
2700 and $desc .= " (unpaid)";
2701 $item->{flags} & Crossfire::Protocol::F_MAGIC
2702 and $desc .= " (magic)";
2703 $item->{flags} & Crossfire::Protocol::F_CURSED
2704 and $desc .= " (cursed)";
2705 $item->{flags} & Crossfire::Protocol::F_DAMNED
2706 and $desc .= " (damned)";
2707 $item->{flags} & Crossfire::Protocol::F_LOCKED
2708 and $desc .= " *";
2709
2710 $desc
2711}
2712
2713sub new {
2714 my $class = shift;
2715
2716 my %args = @_;
2717
2718 my $item = delete $args{item};
2719
2720 my $desc = _item_to_desc ($item);
2721
2722 my $self = $class->SUPER::new (
2723 can_hover => 1,
2724 can_events => 1,
2725 tooltip => ((CFClient::UI::Label::escape $desc)
2726 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2727 connect_button_down => sub {
2728 my ($self, $ev, $x, $y) = @_;
2729
2730 # todo: maybe put examine on 1? but should just be a tooltip :(
2731 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2732 my $targ = $::CONN->{player}{tag};
2733
2734 if ($item->{container} == $::CONN->{player}{tag}) {
2735 $targ = $main::OPENCONT;
2736 }
2737
2738 $::CONN->send ("move $targ $item->{tag} 0");
2739 } elsif ($ev->{button} == 1) {
2740 $::CONN->send ("examine $item->{tag}");
2741 } elsif ($ev->{button} == 2) {
2742 $::CONN->send ("apply $item->{tag}");
2743 } elsif ($ev->{button} == 3) {
2744 my @menu_items = (
2745 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2746 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2747 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2748 (
2749 $item->{flags} & Crossfire::Protocol::F_LOCKED
2750 ? (
2751 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2752 )
2753 : (
2754 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2755 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2756 )
2757 ),
2758 );
2759
2760 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2761 }
2762
2763 1
2764 },
2765 %args
2766 );
2767
2768
2769 $self->add (new CFClient::UI::Face
2770 can_events => 0,
2771 face => $item->{face},
2772 anim => $item->{anim},
2773 animspeed => $item->{animspeed},
2774 );
2775
2776 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2777
2778 $self->{item} = $item;
2779
2780 $self->update_item;
2781
2782 $self
2783}
2784
2785sub update_item {
2786 my ($self) = @_;
2787
2788 my $desc = _item_to_desc ($self->{item});
2789
2790 $self->{name_lbl}->set_text ($desc);
2791}
2792
2793#############################################################################
2794
2795package CFClient::UI::Inventory;
2796
2797our @ISA = CFClient::UI::ScrolledWindow::;
2798
2799sub new {
2800 my $class = shift;
2801
2802 my $self = $class->SUPER::new (
2803 scrolled => (new CFClient::UI::Table),
2804 @_,
2805 );
2806
2807 $self
2808}
2809
2810sub set_items {
2811 my ($self, $items) = @_;
2812
2813 $self->{scrolled}->clear;
2814 return unless $items;
2815
2816 my @items = sort {
2817 ($a->{type} <=> $b->{type})
2818 or ($a->{name} cmp $b->{name})
2819 } @$items;
2820
2821 $self->{real_items} = \@items;
2822
2823 for my $item (@items) {
2824 $item->{item} = $item;
2825 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2826 $item->update_item ();
2827 }
2828
2829 my $i = 0;
2830 for (@items) {
2831 $self->{scrolled}->add (0, $i, $_);
2832 my $nrof = $_->{item}->{nrof} || 1;
2833 $self->{scrolled}->add (1, $i++, new CFClient::UI::Label text => ($_->{item}->{weight} * $nrof) / 1000);
2834 }
2835
2836# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2837}
2838
2839sub size_request {
2840 my ($self) = @_;
2841 ($self->{req_w}, $self->{req_h});
2842}
2843 2885
2844############################################################################# 2886#############################################################################
2845 2887
2846package CFClient::UI::Menu; 2888package CFClient::UI::Menu;
2847 2889
… …
2881 2923
2882# popup given the event (must be a mouse button down event currently) 2924# popup given the event (must be a mouse button down event currently)
2883sub popup { 2925sub popup {
2884 my ($self, $ev) = @_; 2926 my ($self, $ev) = @_;
2885 2927
2886 $self->emit ("popdown"); 2928 $self->_emit ("popdown");
2887 2929
2888 # maybe save $GRAB? must be careful about events... 2930 # maybe save $GRAB? must be careful about events...
2889 $GRAB = $self; 2931 $GRAB = $self;
2890 $self->{button} = $ev->{button}; 2932 $self->{button} = $ev->{button};
2891 2933
2892 $self->show; 2934 $self->show;
2893 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2935 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2894} 2936}
2895 2937
2896sub mouse_motion { 2938sub mouse_motion {
2897 my ($self, $ev, $x, $y) = @_; 2939 my ($self, $ev, $x, $y) = @_;
2898 2940
2899 # TODO: should use vbox->find_widget or so 2941 # TODO: should use vbox->find_widget or so
2900 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2942 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2901 $self->{hover} = $self->{item}{$HOVER}; 2943 $self->{hover} = $self->{item}{$HOVER};
2944
2945 0
2902} 2946}
2903 2947
2904sub button_up { 2948sub button_up {
2905 my ($self, $ev, $x, $y) = @_; 2949 my ($self, $ev, $x, $y) = @_;
2906 2950
2907 if ($ev->{button} == $self->{button}) { 2951 if ($ev->{button} == $self->{button}) {
2908 undef $GRAB; 2952 undef $GRAB;
2909 $self->hide; 2953 $self->hide;
2910 2954
2911 $self->emit ("popdown"); 2955 $self->_emit ("popdown");
2912 $self->{hover}[1]->() if $self->{hover}; 2956 $self->{hover}[1]->() if $self->{hover};
2957 } else {
2958 return 0
2959 }
2960
2961 1
2962}
2963
2964#############################################################################
2965
2966package CFClient::UI::Multiplexer;
2967
2968our @ISA = CFClient::UI::Container::;
2969
2970sub new {
2971 my $class = shift;
2972
2973 my $self = $class->SUPER::new (
2974 @_,
2975 );
2976
2977 $self->{current} = $self->{children}[0]
2978 if @{ $self->{children} };
2979
2980 $self
2981}
2982
2983sub add {
2984 my ($self, @widgets) = @_;
2985
2986 $self->SUPER::add (@widgets);
2987
2988 $self->{current} = $self->{children}[0]
2989 if @{ $self->{children} };
2990}
2991
2992sub set_current_page {
2993 my ($self, $page_or_widget) = @_;
2994
2995 my $widget = ref $page_or_widget
2996 ? $page_or_widget
2997 : $self->{children}[$page_or_widget];
2998
2999 $self->{current} = $widget;
3000 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3001
3002 $self->_emit (page_changed => $self->{current});
3003
3004 $self->realloc;
3005}
3006
3007sub visible_children {
3008 $_[0]{current}
3009}
3010
3011sub size_request {
3012 my ($self) = @_;
3013
3014 $self->{current}->size_request
3015}
3016
3017sub size_allocate {
3018 my ($self, $w, $h) = @_;
3019
3020 $self->{current}->configure (0, 0, $w, $h);
3021}
3022
3023sub _draw {
3024 my ($self) = @_;
3025
3026 $self->{current}->draw;
3027}
3028
3029#############################################################################
3030
3031package CFClient::UI::Notebook;
3032
3033our @ISA = CFClient::UI::VBox::;
3034
3035sub new {
3036 my $class = shift;
3037
3038 my $self = $class->SUPER::new (
3039 buttonbar => (new CFClient::UI::Buttonbar),
3040 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3041 # filter => # will be put between multiplexer and $self
3042 @_,
3043 );
2913 } 3044
3045 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3046 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3047
3048 $self
3049}
3050
3051sub add {
3052 my ($self, $title, $widget, $tooltip) = @_;
3053
3054 Scalar::Util::weaken $self;
3055
3056 $self->{buttonbar}->add (new CFClient::UI::Button
3057 markup => $title,
3058 tooltip => $tooltip,
3059 on_activate => sub { $self->set_current_page ($widget) },
3060 );
3061
3062 $self->{multiplexer}->add ($widget);
3063}
3064
3065sub set_current_page {
3066 my ($self, $page) = @_;
3067
3068 $self->{multiplexer}->set_current_page ($page);
3069 $self->_emit (page_changed => $self->{multiplexer}{current});
2914} 3070}
2915 3071
2916############################################################################# 3072#############################################################################
2917 3073
2918package CFClient::UI::Statusbox; 3074package CFClient::UI::Statusbox;
… …
2978sub add { 3134sub add {
2979 my ($self, $text, %arg) = @_; 3135 my ($self, $text, %arg) = @_;
2980 3136
2981 $text =~ s/^\s+//; 3137 $text =~ s/^\s+//;
2982 $text =~ s/\s+$//; 3138 $text =~ s/\s+$//;
3139
3140 return unless $text;
2983 3141
2984 my $timeout = time + ((delete $arg{timeout}) || 60); 3142 my $timeout = time + ((delete $arg{timeout}) || 60);
2985 3143
2986 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3144 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2987 3145
… …
3021 $self->SUPER::reconfigure; 3179 $self->SUPER::reconfigure;
3022} 3180}
3023 3181
3024############################################################################# 3182#############################################################################
3025 3183
3026package CFClient::UI::Root; 3184package CFClient::UI::Inventory;
3027 3185
3028our @ISA = CFClient::UI::Container::; 3186our @ISA = CFClient::UI::ScrolledWindow::;
3029
3030use CFClient::OpenGL;
3031 3187
3032sub new { 3188sub new {
3033 my $class = shift; 3189 my $class = shift;
3034 3190
3035 $class->SUPER::new ( 3191 my $self = $class->SUPER::new (
3192 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3193 @_,
3194 );
3195
3196 $self
3197}
3198
3199sub set_items {
3200 my ($self, $items) = @_;
3201
3202 $self->{child}->clear;
3203 return unless $items;
3204
3205 my @items = sort {
3206 ($a->{type} <=> $b->{type})
3207 or ($a->{name} cmp $b->{name})
3208 } @$items;
3209
3210 $self->{real_items} = \@items;
3211
3212 my $row = 0;
3213 for my $item (@items) {
3214 CFClient::Item::update_widgets $item;
3215
3216 $self->{child}->add (0, $row, $item->{face_widget});
3217 $self->{child}->add (1, $row, $item->{desc_widget});
3218 $self->{child}->add (2, $row, $item->{weight_widget});
3219
3220 $row++;
3221 }
3222}
3223
3224#############################################################################
3225
3226package CFClient::UI::BindEditor;
3227
3228our @ISA = CFClient::UI::FancyFrame::;
3229
3230sub new {
3231 my $class = shift;
3232
3233 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3234
3235 $self->add (my $vb = new CFClient::UI::VBox);
3236
3237
3238 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3239 text => "start recording",
3240 tooltip => "Start/Stops recording of actions."
3241 ."All subsequent actions after the recording started will be captured."
3242 ."The actions are displayed after the record was stopped."
3243 ."To bind the action you have to click on the 'Bind' button",
3244 on_activate => sub {
3245 unless ($self->{recording}) {
3246 $self->start;
3247 } else {
3248 $self->stop;
3249 }
3250 });
3251
3252 $vb->add (new CFClient::UI::Label text => "Actions:");
3253 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3254
3255 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3256 $vb->add (my $hb = new CFClient::UI::HBox);
3257 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3258 $hb->add (new CFClient::UI::Button
3259 text => "bind",
3260 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3261 on_activate => sub {
3262 $self->ask_for_bind;
3263 });
3264
3265 $vb->add (my $hb = new CFClient::UI::HBox);
3266 $hb->add (new CFClient::UI::Button
3267 text => "ok",
3268 expand => 1,
3269 tooltip => "This closes the binding editor and saves the binding",
3270 on_activate => sub {
3271 $self->hide;
3272 $self->commit;
3273 });
3274
3275 $hb->add (new CFClient::UI::Button
3276 text => "cancel",
3277 expand => 1,
3278 tooltip => "This closes the binding editor without saving",
3279 on_activate => sub {
3280 $self->hide;
3281 $self->{binding_cancel}->()
3282 if $self->{binding_cancel};
3283 });
3284
3285 $self->update_binding_widgets;
3286
3287 $self
3288}
3289
3290sub commit {
3291 my ($self) = @_;
3292 my ($mod, $sym, $cmds) = $self->get_binding;
3293 if ($sym != 0 && @$cmds > 0) {
3294 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3295 ."'. Don't forget 'Save Config'!");
3296 $self->{binding_change}->($mod, $sym, $cmds)
3297 if $self->{binding_change};
3298 } else {
3299 $::STATUSBOX->add ("No action bound, no key or action specified!");
3300 $self->{binding_cancel}->()
3301 if $self->{binding_cancel};
3302 }
3303}
3304
3305sub start {
3306 my ($self) = @_;
3307
3308 $self->{rec_btn}->set_text ("stop recording");
3309 $self->{recording} = 1;
3310 $self->clear_command_list;
3311 $::CONN->start_record if $::CONN;
3312}
3313
3314sub stop {
3315 my ($self) = @_;
3316
3317 $self->{rec_btn}->set_text ("start recording");
3318 $self->{recording} = 0;
3319
3320 my $rec;
3321 $rec = $::CONN->stop_record if $::CONN;
3322 return unless ref $rec eq 'ARRAY';
3323 $self->set_command_list ($rec);
3324}
3325
3326
3327sub ask_for_bind_and_commit {
3328 my ($self) = @_;
3329 $self->ask_for_bind (1);
3330}
3331
3332sub ask_for_bind {
3333 my ($self, $commit) = @_;
3334
3335 CFClient::Binder::open_binding_dialog (sub {
3336 my ($mod, $sym) = @_;
3337 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3338 $self->update_binding_widgets;
3339 $self->commit if $commit;
3340 });
3341}
3342
3343# $mod and $sym are the modifiers and key symbol
3344# $cmds is a array ref of strings (the commands)
3345# $cb is the callback that is executed on OK
3346# $ccb is the callback that is executed on CANCEL and
3347# when the binding was unsuccessful on OK
3348sub set_binding {
3349 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3350
3351 $self->clear_command_list;
3352 $self->{recording} = 0;
3353 $self->{rec_btn}->set_text ("start recording");
3354
3355 $self->{binding} = [$mod, $sym];
3356 $self->{commands} = $cmds;
3357
3358 $self->{binding_change} = $cb;
3359 $self->{binding_cancel} = $ccb;
3360
3361 $self->update_binding_widgets;
3362}
3363
3364# this is a shortcut method that asks for a binding
3365# and then just binds it.
3366sub do_quick_binding {
3367 my ($self, $cmds) = @_;
3368 $self->set_binding (undef, undef, $cmds, sub {
3369 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3370 });
3371 $self->ask_for_bind (1);
3372}
3373
3374sub update_binding_widgets {
3375 my ($self) = @_;
3376 my ($mod, $sym, $cmds) = $self->get_binding;
3377 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3378 $self->set_command_list ($cmds);
3379}
3380
3381sub get_binding {
3382 my ($self) = @_;
3383 return (
3384 $self->{binding}->[0],
3385 $self->{binding}->[1],
3386 [ grep { defined $_ } @{$self->{commands}} ]
3387 );
3388}
3389
3390sub clear_command_list {
3391 my ($self) = @_;
3392 $self->{cmdbox}->clear ();
3393}
3394
3395sub set_command_list {
3396 my ($self, $cmds) = @_;
3397
3398 $self->{cmdbox}->clear ();
3399 $self->{commands} = $cmds;
3400
3401 my $idx = 0;
3402
3403 for (@$cmds) {
3404 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3405
3406 my $i = $idx;
3407 $hb->add (new CFClient::UI::Label text => $_);
3408 $hb->add (new CFClient::UI::Button
3409 text => "delete",
3410 tooltip => "Deletes the action from the record",
3411 on_activate => sub {
3412 $self->{cmdbox}->remove ($hb);
3413 $cmds->[$i] = undef;
3414 });
3415
3416
3417 $idx++
3418 }
3419}
3420
3421#############################################################################
3422
3423package CFClient::UI::SpellList;
3424
3425our @ISA = CFClient::UI::Table::;
3426
3427sub new {
3428 my $class = shift;
3429
3430 my $self = $class->SUPER::new (
3431 binding => [],
3432 commands => [],
3036 @_, 3433 @_,
3037 ) 3434 )
3038} 3435}
3039 3436
3040sub configure { 3437# XXX: Do sorting? Argl...
3041 my ($self, $x, $y, $w, $h) = @_; 3438sub add_spell {
3042
3043 $self->{w} = $w;
3044 $self->{h} = $h;
3045}
3046
3047sub check_size {
3048 my ($self) = @_; 3439 my ($self, $spell) = @_;
3440 $self->{spells}->{$spell->{name}} = $spell;
3049 3441
3050 $self->size_allocate ($self->{w}, $self->{h}) 3442 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
3051 if $self->{w}; 3443 face => $spell->{face},
3444 can_hover => 1,
3445 can_events => 1,
3446 tooltip => $spell->{message});
3447
3448 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3449 text => $spell->{name},
3450 can_hover => 1,
3451 can_events => 1,
3452 tooltip => $spell->{message},
3453 expand => 1);
3454
3455 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3456 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3457 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3458 expand => 1);
3459
3460 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3461 text => "bind to key",
3462 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3463}
3464
3465sub rebuild_spell_list {
3466 my ($self) = @_;
3467 $self->{tbl_idx} = 0;
3468 $self->add_spell ($_) for values %{$self->{spells}};
3469}
3470
3471sub remove_spell {
3472 my ($self, $spell) = @_;
3473 delete $self->{spells}->{$spell->{name}};
3474 $self->rebuild_spell_list;
3475}
3476
3477#############################################################################
3478
3479package CFClient::UI::Root;
3480
3481our @ISA = CFClient::UI::Container::;
3482
3483use CFClient::OpenGL;
3484
3485sub new {
3486 my $class = shift;
3487
3488 my $self = $class->SUPER::new (
3489 visible => 1,
3490 @_,
3491 );
3492
3493 Scalar::Util::weaken ($self->{root} = $self);
3494
3495 $self
3052} 3496}
3053 3497
3054sub size_request { 3498sub size_request {
3055 my ($self) = @_; 3499 my ($self) = @_;
3056 3500
3057 ($self->{w}, $self->{h}) 3501 ($self->{w}, $self->{h})
3502}
3503
3504sub _to_pixel {
3505 my ($coord, $size, $max) = @_;
3506
3507 $coord =
3508 $coord eq "center" ? ($max - $size) * 0.5
3509 : $coord eq "max" ? $max
3510 : $coord;
3511
3512 $coord = 0 if $coord < 0;
3513 $coord = $max - $size if $coord > $max - $size;
3514
3515 int $coord + 0.5
3058} 3516}
3059 3517
3060sub size_allocate { 3518sub size_allocate {
3061 my ($self, $w, $h) = @_; 3519 my ($self, $w, $h) = @_;
3062 3520
3063 for my $child ($self->children) { 3521 for my $child ($self->children) {
3064 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3522 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3065 3523
3066 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3524 $X = $child->{force_x} if exists $child->{force_x};
3067 if exists $child->{req_x}; 3525 $Y = $child->{force_y} if exists $child->{force_y};
3068 3526
3069 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3527 $X = _to_pixel $X, $W, $self->{w};
3070 if exists $child->{req_y}; 3528 $Y = _to_pixel $Y, $H, $self->{h};
3071
3072 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3073 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3074 3529
3075 $child->configure ($X, $Y, $W, $H); 3530 $child->configure ($X, $Y, $W, $H);
3076 } 3531 }
3077} 3532}
3078 3533
… …
3089} 3544}
3090 3545
3091sub update { 3546sub update {
3092 my ($self) = @_; 3547 my ($self) = @_;
3093 3548
3094 $self->check_size;
3095 $::WANT_REFRESH++; 3549 $::WANT_REFRESH++;
3096} 3550}
3097 3551
3098sub add { 3552sub add {
3099 my ($self, @children) = @_; 3553 my ($self, @children) = @_;
3100 3554
3101 for (my @widgets = @children; my $w = pop @widgets; ) {
3102 push @widgets, $w->children;
3103 $w->{root} = $self;
3104 $w->{visible} = 1;
3105 }
3106
3107 for my $child (@children) {
3108 $child->{is_toplevel} = 1; 3555 $_->{is_toplevel} = 1
3109 3556 for @children;
3110 # integerise window positions
3111 $child->{x} = int $child->{x};
3112 $child->{y} = int $child->{y};
3113 }
3114 3557
3115 $self->SUPER::add (@children); 3558 $self->SUPER::add (@children);
3116} 3559}
3117 3560
3118sub remove { 3561sub remove {
3119 my ($self, @children) = @_; 3562 my ($self, @children) = @_;
3120 3563
3121 $self->SUPER::remove (@children); 3564 $self->SUPER::remove (@children);
3565
3566 delete $self->{is_toplevel}
3567 for @children;
3122 3568
3123 while (@children) { 3569 while (@children) {
3124 my $w = pop @children; 3570 my $w = pop @children;
3125 push @children, $w->children; 3571 push @children, $w->children;
3126 delete $w->{visible}; 3572 $w->set_invisible;
3127 } 3573 }
3128} 3574}
3129 3575
3130sub on_refresh { 3576sub on_refresh {
3131 my ($self, $id, $cb) = @_; 3577 my ($self, $id, $cb) = @_;
… …
3145 while ($self->{refresh_hook}) { 3591 while ($self->{refresh_hook}) {
3146 $_->() 3592 $_->()
3147 for values %{delete $self->{refresh_hook}}; 3593 for values %{delete $self->{refresh_hook}};
3148 } 3594 }
3149 3595
3150 if ($self->{check_size}) { 3596 if ($self->{realloc}) {
3151 my @queue = ([], []); 3597 my %queue;
3598 my @queue;
3599 my $widget;
3152 3600
3153 for (;;) { 3601 outer:
3154 if ($self->{check_size}) { 3602 while () {
3155 # heuristic: check containers last 3603 if (my $realloc = delete $self->{realloc}) {
3156 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3604 for $widget (values %$realloc) {
3157 for values %{delete $self->{check_size}} 3605 $widget->{visible} or next; # do not resize invisible widgets
3606
3607 $queue{$widget+0}++ and next; # duplicates are common
3608
3609 push @{ $queue[$widget->{visible}] }, $widget;
3610 }
3158 } 3611 }
3159 3612
3160 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3613 while () {
3614 @queue or last outer;
3161 3615
3162 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3616 $widget = pop @{ $queue[-1] || [] }
3163 ? @$widget{qw(user_w user_h)} 3617 and last;
3164 : $widget->size_request;
3165
3166 if (delete $widget->{force_alloc}
3167 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3168 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3169 3618
3619 pop @queue;
3620 }
3621
3622 delete $queue{$widget+0};
3623
3624 my ($w, $h) = $widget->size_request;
3625
3626 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3627 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3628
3629 $w = $widget->{force_w} if exists $widget->{force_w};
3630 $h = $widget->{force_h} if exists $widget->{force_h};
3631
3632 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3633 || delete $widget->{force_realloc}) {
3170 $widget->{req_w} = $w; 3634 $widget->{req_w} = $w;
3171 $widget->{req_h} = $h; 3635 $widget->{req_h} = $h;
3172 3636
3173 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3637 $self->{size_alloc}{$widget+0} = $widget;
3174 3638
3175 $widget->{parent}->check_size
3176 if $widget->{parent}; 3639 if (my $parent = $widget->{parent}) {
3640 $self->{realloc}{$parent+0} = $parent
3641 unless $queue{$parent+0};
3642
3643 $parent->{force_size_alloc} = 1;
3644 $self->{size_alloc}{$parent+0} = $parent;
3645 }
3177 } 3646 }
3647
3648 delete $self->{realloc}{$widget+0};
3178 } 3649 }
3179 } 3650 }
3180 3651
3181 while ($self->{size_alloc}) { 3652 while (my $size_alloc = delete $self->{size_alloc}) {
3182 for (values %{delete $self->{size_alloc}}) { 3653 my @queue = sort { $b->{visible} <=> $a->{visible} }
3183 my ($widget, $w, $h) = @$_; 3654 values %$size_alloc;
3655
3656 while () {
3657 my $widget = pop @queue || last;
3658
3659 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3184 3660
3185 $w = 0 if $w < 0; 3661 $w = 0 if $w < 0;
3186 $h = 0 if $h < 0; 3662 $h = 0 if $h < 0;
3187 3663
3664 $w = int $w + 0.5;
3665 $h = int $h + 0.5;
3666
3667 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3668 $widget->{old_w} = $widget->{w};
3669 $widget->{old_h} = $widget->{h};
3670
3188 $widget->{w} = $w; 3671 $widget->{w} = $w;
3189 $widget->{h} = $h; 3672 $widget->{h} = $h;
3190 $widget->size_allocate ($w, $h); 3673
3191 $widget->emit (size_allocate => $w, $h); 3674 $widget->emit (size_allocate => $w, $h);
3675 }
3192 } 3676 }
3193 } 3677 }
3194 3678
3195 while ($self->{post_alloc_hook}) { 3679 while ($self->{post_alloc_hook}) {
3196 $_->() 3680 $_->()
3197 for values %{delete $self->{post_alloc_hook}}; 3681 for values %{delete $self->{post_alloc_hook}};
3198 } 3682 }
3683
3199 3684
3200 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3685 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3201 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3686 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3202 glClear GL_COLOR_BUFFER_BIT; 3687 glClear GL_COLOR_BUFFER_BIT;
3203 3688
… …
3205 glLoadIdentity; 3690 glLoadIdentity;
3206 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 3691 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3207 glMatrixMode GL_MODELVIEW; 3692 glMatrixMode GL_MODELVIEW;
3208 glLoadIdentity; 3693 glLoadIdentity;
3209 3694
3695 {
3696 package CFClient::UI::Base;
3697
3698 ($draw_x, $draw_y, $draw_w, $draw_h) =
3699 (0, 0, $self->{w}, $self->{h});
3700 }
3701
3210 $self->_draw; 3702 $self->_draw;
3211} 3703}
3212 3704
3213############################################################################# 3705#############################################################################
3214 3706

Diff Legend

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