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.203 by root, Sun May 14 21:13:11 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 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 if ($x + $TOOLTIP->{w} > $::WIDTH) {
37 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
38 }
39
40 $TOOLTIP->move ($x, $y);
41 $TOOLTIP->check_size;
42 $TOOLTIP->update;
43 } 61 }
44 62
45 return; 63 return;
46 } 64 }
47 } 65 }
51 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
52} 70}
53 71
54# class methods for events 72# class methods for events
55sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
56 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
57 if $FOCUS; 75 if $FOCUS;
58} 76}
59 77
60sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
61 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
62 if $FOCUS; 80 if $FOCUS;
63} 81}
64 82
65sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
66 my ($ev) = @_; 84 my ($ev) = @_;
75 check_tooltip; 93 check_tooltip;
76 } 94 }
77 95
78 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
79 97
80 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
81 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
82 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
83 }
84} 100}
85 101
86sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
87 my ($ev) = @_; 103 my ($ev) = @_;
88 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
89 105
90 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
91 107
92 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
93 109
94 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
95 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
96 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
97 }
98 112
99 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
100 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
101 $grab->update if $grab; 115 $grab->update if $grab;
102 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
118 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
119 133
120 check_tooltip; 134 check_tooltip;
121 } 135 }
122 136
123 if ($HOVER) {
124 ($x, $y) = $HOVER->coord2local ($x, $y);
125 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
126 } 138 if $HOVER;
127} 139}
128 140
129# convert position array to integers 141# convert position array to integers
130sub harmonize { 142sub harmonize {
131 my ($vals) = @_; 143 my ($vals) = @_;
137 $rem += $_ - $i; 149 $rem += $_ - $i;
138 $_ = $i; 150 $_ = $i;
139 } 151 }
140} 152}
141 153
154sub full_refresh {
155 # make a copy, otherwise for complains about freed values.
156 my @widgets = values %WIDGET;
157
158 $_->update
159 for @widgets;
160}
161
162sub reconfigure_widgets {
163 # make a copy, otherwise C<for> complains about freed values.
164 my @widgets = values %WIDGET;
165
166 $_->reconfigure
167 for @widgets;
168}
169
142# call when resolution changes etc. 170# call when resolution changes etc.
143sub rescale_widgets { 171sub rescale_widgets {
144 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
145 173
146 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
147 if ($widget->{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
148 $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.]+$/;
149 $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};
150 $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};
151 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
152 $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.]+$/;
153 $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};
154 $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};
155 $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
156 } 189 }
157
158 $widget->reconfigure;
159 } 190 }
191
192 reconfigure_widgets;
160} 193}
161 194
162############################################################################# 195#############################################################################
163 196
164package CFClient::UI::Base; 197package CFClient::UI::Base;
169 202
170sub new { 203sub new {
171 my $class = shift; 204 my $class = shift;
172 205
173 my $self = bless { 206 my $self = bless {
174 x => 0, 207 x => "center",
175 y => 0, 208 y => "center",
176 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
177 can_events => 1, 212 can_events => 1,
178 @_ 213 @_
179 }, $class; 214 }, $class;
180 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
181 for (keys %$self) { 218 for (keys %$self) {
182 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
183 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
184 } 221 }
185 } 222 }
186 223
187 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 }
188 235
189 $self 236 $self
190} 237}
191 238
192sub destroy { 239sub destroy {
202 return if $self->{parent}; 249 return if $self->{parent};
203 250
204 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
205} 252}
206 253
207sub hide { 254sub set_visible {
208 my ($self) = @_; 255 my ($self) = @_;
256
257 return if $self->{visible};
258
259 $self->{root} = $self->{parent}{root};
260 $self->{visible} = $self->{parent}{visible} + 1;
261
262 $self->emit (visibility_change => 1);
263
264 $self->realloc if !exists $self->{req_w};
265
266 $_->set_visible for $self->children;
267}
268
269sub set_invisible {
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};
209 278
210 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
211 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
212 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
213 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
214 if $self->{parent}; 313 if $self->{parent};
215} 314}
216 315
217sub move { 316sub move_abs {
218 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
219 318
220 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
221 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
222 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
223 322
224 $self->update; 323 $self->update;
225} 324}
226 325
227sub set_size { 326sub set_size {
228 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
229 328
230 $self->{user_w} = $w; 329 $self->{force_w} = $w;
231 $self->{user_h} = $h; 330 $self->{force_h} = $h;
232 331
233 $self->check_size; 332 $self->realloc;
234} 333}
235 334
236sub size_request { 335sub size_request {
237 require Carp; 336 require Carp;
238 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
240 339
241sub configure { 340sub configure {
242 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
243 342
244 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
245 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
246 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
247 348
248 # use alignment to adjust x, y 349 # use alignment to adjust x, y
249 350
250 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
251 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
252
253 ($w, $h) = ($w2, $h2);
254 } 353 }
255 354
256 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
257 $self->{x} = $x; 356 $self->{x} = $x;
258 $self->{y} = $y; 357 $self->{y} = $y;
259 $self->update; 358 $self->update;
260 } 359 }
261 360
262 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
263 $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;
264 } 368 }
265} 369}
266 370
267sub size_allocate { 371sub size_allocate {
268 # nothing to be done 372 # nothing to be done
269} 373}
270 374
271sub reconfigure {
272 my ($self) = @_;
273
274 $self->check_size (1);
275 $self->update;
276}
277
278sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
279} 381}
280 382
281sub set_max_size { 383sub set_max_size {
282 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
283 385
284 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
285 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 delete $self->{max_h}; $self->{max_h} = $h if $h;
388}
389
390sub set_tooltip {
391 my ($self, $tooltip) = @_;
392
393 $tooltip =~ s/^\s+//;
394 $tooltip =~ s/\s+$//;
395
396 return if $self->{tooltip} eq $tooltip;
397
398 $self->{tooltip} = $tooltip;
399
400 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
401 delete $CFClient::UI::TOOLTIP->{owner};
402 CFClient::UI::check_tooltip;
403 }
286} 404}
287 405
288# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
289sub coord2local { 407sub coord2local {
290 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
305 return if $FOCUS == $self; 423 return if $FOCUS == $self;
306 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
307 425
308 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
309 427
310 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
311 429
312 $focus->update if $focus; 430 $focus->update if $focus;
313 $FOCUS->update; 431 $FOCUS->update;
314} 432}
315 433
318 436
319 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
320 438
321 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
322 440
323 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
324 442
325 $focus->update if $focus; #? 443 $focus->update if $focus; #?
326}
327 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
328sub mouse_motion { } 449sub mouse_motion { 0 }
329sub button_up { } 450sub button_up { 0 }
330sub key_down { } 451sub key_down { 0 }
331sub key_up { } 452sub key_up { 0 }
332 453
333sub button_down { 454sub button_down {
334 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
335 456
336 $self->focus_in; 457 $self->focus_in;
337}
338 458
339sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
340sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
341sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
342sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
343sub 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
344 535
345sub draw { 536sub draw {
346 my ($self) = @_; 537 my ($self) = @_;
347 538
348 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);
349 550
350 glPushMatrix; 551 glPushMatrix;
351 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
352 $self->_draw; 553 $self->_draw;
353 glPopMatrix; 554 glPopMatrix;
365 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
366 glEnd; 567 glEnd;
367 glDisable GL_BLEND; 568 glDisable GL_BLEND;
368 } 569 }
369 570
370 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
371 glPushMatrix; 572 glPushMatrix;
372 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
373 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
374 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
375 glVertex 0 , 0; 576 glVertex 0 , 0;
376 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
377 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
378 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
379 glEnd; 580 glEnd;
380 glPopMatrix; 581 glPopMatrix;
381 CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 582 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
382 } 583 }
383} 584}
384 585
385sub _draw { 586sub _draw {
386 my ($self) = @_; 587 my ($self) = @_;
387 588
388 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
389}
390
391sub find_widget {
392 my ($self, $x, $y) = @_;
393
394 return () unless $self->{can_events};
395
396 return $self
397 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
398 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
399
400 ()
401}
402
403sub set_parent {
404 my ($self, $parent) = @_;
405
406 Scalar::Util::weaken ($self->{parent} = $parent);
407
408 # TODO: req_w _does_change after ->reconfigure
409 $self->check_size
410 unless exists $self->{req_w};
411}
412
413sub check_size {
414 my ($self, $forced) = @_;
415
416 $self->{force_alloc} = 1 if $forced;
417 $CFClient::UI::ROOT->{check_size}{$self} = $self;
418}
419
420sub update {
421 my ($self) = @_;
422
423 $self->{parent}->update
424 if $self->{parent};
425}
426
427sub connect {
428 my ($self, $signal, $cb) = @_;
429
430 push @{ $self->{signal_cb}{$signal} }, $cb;
431}
432
433sub emit {
434 my ($self, $signal, @args) = @_;
435
436 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
437} 590}
438 591
439sub DESTROY { 592sub DESTROY {
440 my ($self) = @_; 593 my ($self) = @_;
441 594
456 my $class = shift; 609 my $class = shift;
457 610
458 # range [value, low, high, page] 611 # range [value, low, high, page]
459 612
460 $class->SUPER::new ( 613 $class->SUPER::new (
461 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
462 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
463 @_ 616 @_
464 ) 617 )
465} 618}
466 619
467sub _draw { 620sub _draw {
468 my ($self) = @_; 621 my ($self) = @_;
469 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
470 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
471 629
472 glEnable GL_BLEND; 630 glEnable GL_BLEND;
473 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
474 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
475 633
476 glBegin GL_QUADS; 634 glBegin GL_QUADS;
477 glVertex 0 , 0; 635 glVertex 0 , 0;
478 glVertex 0 , $h; 636 glVertex 0 , $h;
479 glVertex $w, $h; 637 glVertex $w, $h;
480 glVertex $w, 0; 638 glVertex $w, 0;
481 glEnd; 639 glEnd;
482 640
483 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
484} 643}
485 644
486############################################################################# 645#############################################################################
487 646
488package CFClient::UI::Empty; 647package CFClient::UI::Empty;
493 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
494 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
495} 654}
496 655
497sub size_request { 656sub size_request {
498 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
499} 660}
500 661
501sub draw { } 662sub draw { }
502 663
503############################################################################# 664#############################################################################
507our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
508 669
509sub new { 670sub new {
510 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
511 672
512 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
513 674
514 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
515 children => [], 676 children => [],
516 can_events => 0, 677 can_events => 0,
517 %arg, 678 %arg,
518 ); 679 );
680
519 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
520 683
521 $self 684 $self
522} 685}
523 686
524sub add { 687sub add {
532 $self->{children} = [ 695 $self->{children} = [
533 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
534 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
535 ]; 698 ];
536 699
537 $self->check_size (1); 700 $self->realloc;
538 $self->update;
539} 701}
540 702
541sub children { 703sub children {
542 @{ $_[0]{children} } 704 @{ $_[0]{children} }
543} 705}
548 delete $child->{parent}; 710 delete $child->{parent};
549 $child->hide; 711 $child->hide;
550 712
551 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
552 714
553 $self->check_size; 715 $self->realloc;
554 $self->update;
555} 716}
556 717
557sub clear { 718sub clear {
558 my ($self) = @_; 719 my ($self) = @_;
559 720
563 for (@$children) { 724 for (@$children) {
564 delete $_->{parent}; 725 delete $_->{parent};
565 $_->hide; 726 $_->hide;
566 } 727 }
567 728
568 $self->check_size; 729 $self->realloc;
569 $self->update;
570} 730}
571 731
572sub find_widget { 732sub find_widget {
573 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
574 734
575 $x -= $self->{x}; 735 $x -= $self->{x};
576 $y -= $self->{y}; 736 $y -= $self->{y};
577 737
578 my $res; 738 my $res;
579 739
580 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
581 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
582 and return $res; 742 and return $res;
583 } 743 }
584 744
585 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
634 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
635} 795}
636 796
637############################################################################# 797#############################################################################
638 798
799# back-buffered drawing area
800
639package CFClient::UI::Window; 801package CFClient::UI::Window;
640 802
641our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
642 804
643use CFClient::OpenGL; 805use CFClient::OpenGL;
661 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
662 $self->update; 824 $self->update;
663} 825}
664 826
665sub _render { 827sub _render {
828 my ($self) = @_;
829
666 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
667} 831}
668 832
669sub render_child { 833sub render_child {
670 my ($self) = @_; 834 my ($self) = @_;
671 835
672 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 836 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
673 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
674 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
675 839
840 {
841 package CFClient::UI::Base;
842
843 ($draw_x, $draw_y, $draw_w, $draw_h) =
844 (0, 0, $self->{w}, $self->{h});
845 }
846
676 $self->_render; 847 $self->_render;
677# glColorMask 1, 1, 1, 0;
678# glEnable GL_BLEND;
679# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
680# glRasterPos 0, 0;
681# glCopyPixels 0, 0, $self->{w}, $self->{h};
682# glDisable GL_BLEND;
683# glColorMask 1, 1, 1, 1;
684 }; 848 };
685} 849}
686 850
687sub _draw { 851sub _draw {
688 my ($self) = @_; 852 my ($self) = @_;
689 853
690 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
691 855
692 my $tex = $self->{texture} 856 my $tex = $self->{texture}
693 or return; 857 or return;
694 858
695 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
697 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
698 862
699 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
700 864
701 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
702} 866}
705 869
706package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
707 871
708our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
709 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
710sub size_request { 884sub size_request {
711 my ($self) = @_; 885 my ($self) = @_;
712 886
713 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
714 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
715 888
716 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
717} 893}
718 894
719sub size_allocate { 895sub size_allocate {
720 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
721 897
898 my $child = $self->child;
899
900 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
901 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
902
903 $self->child->configure (0, 0, $w, $h);
722 $self->update; 904 $self->update;
723} 905}
724 906
725sub set_offset { 907sub set_offset {
726 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
760} 942}
761 943
762sub _render { 944sub _render {
763 my ($self) = @_; 945 my ($self) = @_;
764 946
947 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
948 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
949
765 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
766 951
767 $self->SUPER::_render; 952 $self->SUPER::_render;
768} 953}
769 954
772package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
773 958
774our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
775 960
776sub new { 961sub new {
777 my $class = shift; 962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
778 965
779 my $self; 966 my $self;
780 967
781 my $slider = new CFClient::UI::Slider 968 my $slider = new CFClient::UI::Slider
782 vertical => 1, 969 vertical => 1,
783 range => [0, 0, 1, 0.01], # HACK fix 970 range => [0, 0, 1, 0.01], # HACK fix
784 connect_changed => sub { 971 on_changed => sub {
785 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 972 $self->{vp}->set_offset (0, $_[1]);
786 }, 973 },
787 ; 974 ;
788 975
789 $self = $class->SUPER::new ( 976 $self = $class->SUPER::new (
790 vp => (new CFClient::UI::ViewPort), 977 vp => (new CFClient::UI::ViewPort expand => 1),
791 slider => $slider, 978 slider => $slider,
792 @_, 979 %arg,
793 ); 980 );
794 981
795 $self->{vp}->add ($self->{scrolled});
796 $self->add ($self->{vp});
797 $self->add ($self->{slider}); 982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
798 984
799 $self 985 $self
986}
987
988sub add {
989 my ($self, $widget) = @_;
990
991 $self->{vp}->add ($self->{child} = $widget);
992}
993
994sub update {
995 my ($self) = @_;
996
997 $self->SUPER::update;
998
999 # todo: overwrite size_allocate of child
1000 my $child = $self->{vp}->child;
1001 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1002}
1003
1004sub size_allocate {
1005 my ($self, $w, $h) = @_;
1006
1007 $self->SUPER::size_allocate ($w, $h);
1008
1009 my $child = $self->{vp}->child;
1010 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
800} 1011}
801 1012
802#TODO# update range on size_allocate depending on child 1013#TODO# update range on size_allocate depending on child
803# update viewport offset on scroll 1014# update viewport offset on scroll
804 1015
848 1059
849our @ISA = CFClient::UI::Bin::; 1060our @ISA = CFClient::UI::Bin::;
850 1061
851use CFClient::OpenGL; 1062use CFClient::OpenGL;
852 1063
853my @tex = 1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
854 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
855 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
856 1071
857sub new { 1072sub new {
858 my $class = shift; 1073 my ($class, %arg) = @_;
859 1074
860 # TODO: user_x, user_y, overwrite moveto? 1075 my $title = delete $arg{title};
861 1076
862 my $self = $class->SUPER::new ( 1077 my $self = $class->SUPER::new (
863 bg => [1, 1, 1, 1], 1078 bg => [1, 1, 1, 1],
864 border_bg => [1, 1, 1, 1], 1079 border_bg => [1, 1, 1, 1],
865 border => 0.6, 1080 border => 0.6,
866 toplevel => 1,
867 can_events => 1, 1081 can_events => 1,
868 @_ 1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
869 ); 1085 );
870 1086
871 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
872 align => 0, 1088 align => 0,
873 valign => 1, 1089 valign => 1,
874 text => $self->{title}, 1090 text => $title,
875 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
876 1093
877 $self 1094 $self
1095}
1096
1097sub add {
1098 my ($self, @widgets) = @_;
1099
1100 $self->SUPER::add (@widgets);
1101 $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
878} 1102}
879 1103
880sub border { 1104sub border {
881 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
882} 1106}
883 1107
884sub size_request { 1108sub size_request {
885 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
886 1113
887 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
888 1115
889 ( 1116 (
890 $w + $self->border * 2, 1117 $w + $self->border * 2,
893} 1120}
894 1121
895sub size_allocate { 1122sub size_allocate {
896 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
897 1124
1125 if ($self->{title}) {
1126 $self->{title}{w} = $w;
1127 $self->{title}{h} = $h;
1128 $self->{title}->size_allocate ($w, $h);
1129 }
1130
1131 my $border = $self->border;
1132
898 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
899 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
900 1135
901 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
902 if $self->{title};
903
904 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
905} 1137}
906 1138
907sub button_down { 1139sub button_down {
908 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
909 1141
925 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
926 1158
927 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
928 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
929 1161
930 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
931 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1165 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size; 1166 $self->realloc;
934 }; 1167 };
935 1168
936 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
937 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
938 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
940 $self->{motion} = sub { 1173 $self->{motion} = sub {
941 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
942 1175
943 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
944 1177
945 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
946 $self->update; 1179 # HACK: the next line is required to enforce placement
1180 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
947 }; 1181 };
1182 } else {
1183 return 0;
1184 }
1185
948 } 1186 1
949} 1187}
950 1188
951sub button_up { 1189sub button_up {
952 my ($self, $ev, $x, $y) = @_; 1190 my ($self, $ev, $x, $y) = @_;
953 1191
954 delete $self->{motion}; 1192 !!delete $self->{motion}
955} 1193}
956 1194
957sub mouse_motion { 1195sub mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1196 my ($self, $ev, $x, $y) = @_;
959 1197
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1198 $self->{motion}->($ev, $x, $y) if $self->{motion};
1199
1200 !!$self->{motion}
961} 1201}
962 1202
963sub _draw { 1203sub _draw {
964 my ($self) = @_; 1204 my ($self) = @_;
965 1205
1206 my $child = $self->{children}[0];
1207
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1208 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1209 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1210
969 glEnable GL_TEXTURE_2D; 1211 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1212 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1213
972 my $border = $self->border; 1214 my $border = $self->border;
973 1215
974 glColor @{ $self->{border_bg} }; 1216 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1217 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1218 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1219 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1220 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1221
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1222 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1223 glColor @{ $self->{bg} };
982 1224
983 # TODO: repeat texture not scale 1225 # TODO: repeat texture not scale
1226 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1227 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1228 $bg->{t} = $ch / $bg->{h};
986
987 glColor @{ $self->{bg} };
988
989 $bg->{s} = $rep_x;
990 $bg->{t} = $rep_y;
991 $bg->{wrap_mode} = 1;
992 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1229 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1230 }
994 1231
995 glDisable GL_TEXTURE_2D; 1232 glDisable GL_TEXTURE_2D;
996 1233
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1234 $child->draw;
1235
1236 if ($self->{title}) {
1237 glTranslate 0, $border - $self->{h};
1238 $self->{title}->_draw;
1239 }
1000} 1240}
1001 1241
1002############################################################################# 1242#############################################################################
1003 1243
1004package CFClient::UI::Table; 1244package CFClient::UI::Table;
1012sub new { 1252sub new {
1013 my $class = shift; 1253 my $class = shift;
1014 1254
1015 $class->SUPER::new ( 1255 $class->SUPER::new (
1016 col_expand => [], 1256 col_expand => [],
1017 @_ 1257 @_,
1018 ) 1258 )
1259}
1260
1261sub children {
1262 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1263}
1020 1264
1021sub add { 1265sub add {
1022 my ($self, $x, $y, $child) = @_; 1266 my ($self, $x, $y, $child) = @_;
1023 1267
1024 $child->set_parent ($self); 1268 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1269 $self->{children}[$y][$x] = $child;
1026 1270
1027 $child->check_size; 1271 $self->realloc;
1028} 1272}
1029 1273
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1274# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1275sub clear {
1036 my ($self) = @_; 1276 my ($self) = @_;
1037 1277
1038 my @children = $self->children; 1278 my @children = $self->children;
1039 delete $self->{children}; 1279 delete $self->{children};
1041 for (@children) { 1281 for (@children) {
1042 delete $_->{parent}; 1282 delete $_->{parent};
1043 $_->hide; 1283 $_->hide;
1044 } 1284 }
1045 1285
1046 $self->update; 1286 $self->realloc;
1047} 1287}
1048 1288
1049sub get_wh { 1289sub get_wh {
1050 my ($self) = @_; 1290 my ($self) = @_;
1051 1291
1082sub size_allocate { 1322sub size_allocate {
1083 my ($self, $w, $h) = @_; 1323 my ($self, $w, $h) = @_;
1084 1324
1085 my ($ws, $hs) = $self->get_wh; 1325 my ($ws, $hs) = $self->get_wh;
1086 1326
1087 my $req_w = sum @$ws; 1327 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1328 my $req_h = (sum @$hs) || 1;
1089 1329
1090 # TODO: nicer code && do row_expand 1330 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1331 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1332 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1333 my $col_expand = (sum @col_expand) || 1;
1147 } 1387 }
1148} 1388}
1149 1389
1150############################################################################# 1390#############################################################################
1151 1391
1152package CFClient::UI::HBox; 1392package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1393
1156our @ISA = CFClient::UI::Container::; 1394our @ISA = CFClient::UI::Container::;
1157 1395
1158sub size_request { 1396sub size_request {
1159 my ($self) = @_; 1397 my ($self) = @_;
1160 1398
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1399 $self->{vertical}
1162 1400 ? (
1163 ( 1401 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1402 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1403 )
1166 ) 1404 : (
1405 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1406 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1407 )
1167} 1408}
1168 1409
1169sub size_allocate { 1410sub size_allocate {
1170 my ($self, $w, $h) = @_; 1411 my ($self, $w, $h) = @_;
1171 1412
1172 ($h, $w) = ($w, $h); 1413 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1414 my $children = $self->{children};
1175 1415
1176 my @h = map $_->{req_w}, @$children; 1416 my @req;
1177 1417
1178 my $req_h = List::Util::sum @h; 1418 if ($self->{homogeneous}) {
1179 1419 @req = ($space / (@$children || 1)) x @$children;
1180 if ($req_h > $h) {
1181 # ah well, not enough space
1182 $_ *= $h / $req_h for @h;
1183 } else { 1420 } else {
1421 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1422 my $req = List::Util::sum @req;
1423
1424 if ($req > $space) {
1425 # ah well, not enough space
1426 $_ *= $space / $req for @req;
1427 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1428 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1429
1430 $space = ($space - $req) / $expand; # remaining space to give away
1431
1432 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1433 for 0 .. $#$children;
1188 my $child = $children->[$_];
1189
1190 my $alloc_h = $h[$_];
1191 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1192 $h[$_] = $alloc_h;
1193 } 1434 }
1194 } 1435 }
1195 1436
1196 CFClient::UI::harmonize \@h; 1437 CFClient::UI::harmonize \@req;
1197 1438
1198 my $y = 0; 1439 my $pos = 0;
1199 for (0 .. $#$children) { 1440 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1441 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1442 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1443
1204 $y += $h; 1444 $pos += $alloc;
1205 } 1445 }
1206 1446
1207 1 1447 1
1208} 1448}
1209 1449
1210############################################################################# 1450#############################################################################
1211 1451
1452package CFClient::UI::HBox;
1453
1454our @ISA = CFClient::UI::Box::;
1455
1456sub new {
1457 my $class = shift;
1458
1459 $class->SUPER::new (
1460 vertical => 0,
1461 @_,
1462 )
1463}
1464
1465#############################################################################
1466
1212package CFClient::UI::VBox; 1467package CFClient::UI::VBox;
1213 1468
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1469our @ISA = CFClient::UI::Box::;
1217 1470
1218sub size_request { 1471sub new {
1219 my ($self) = @_; 1472 my $class = shift;
1220 1473
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1474 $class->SUPER::new (
1222 1475 vertical => 1,
1223 ( 1476 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1477 )
1227} 1478}
1228 1479
1229sub size_allocate {
1230 my ($self, $w, $h) = @_;
1231
1232 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1233
1234 my $children = $self->{children};
1235
1236 my @h = map $_->{req_h}, @$children;
1237
1238 my $req_h = List::Util::sum @h;
1239
1240 if ($req_h > $h) {
1241 # ah well, not enough space
1242 $_ *= $h / $req_h for @h;
1243 } else {
1244 my $exp = List::Util::sum map $_->{expand}, @$children;
1245 $exp ||= 1;
1246
1247 for (0 .. $#$children) {
1248 my $child = $children->[$_];
1249
1250 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1251 }
1252 }
1253
1254 CFClient::UI::harmonize \@h;
1255
1256 my $y = 0;
1257 for (0 .. $#$children) {
1258 my $child = $children->[$_];
1259 my $h = $h[$_];
1260 $child->configure (0, $y, $w, $h);
1261
1262 $y += $h;
1263 }
1264
1265 1
1266}
1267
1268############################################################################# 1480#############################################################################
1269 1481
1270package CFClient::UI::Label; 1482package CFClient::UI::Label;
1271 1483
1272our @ISA = CFClient::UI::Base::; 1484our @ISA = CFClient::UI::DrawBG::;
1273 1485
1274use CFClient::OpenGL; 1486use CFClient::OpenGL;
1275 1487
1276sub new { 1488sub new {
1277 my ($class, %arg) = @_; 1489 my ($class, %arg) = @_;
1278 1490
1279 my $self = $class->SUPER::new ( 1491 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1492 fg => [1, 1, 1],
1493 #bg => none
1494 #active_bg => none
1281 #font => default_font 1495 #font => default_font
1282 #text => initial text 1496 #text => initial text
1283 #markup => initial narkup 1497 #markup => initial narkup
1498 #max_w => maximum pixel width
1499 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1500 layout => (new CFClient::Layout),
1285 fontsize => 1, 1501 fontsize => 1,
1286 align => -1, 1502 align => -1,
1287 valign => -1, 1503 valign => -1,
1288 padding => 2, 1504 padding_x => 2,
1505 padding_y => 2,
1289 can_events => 0, 1506 can_events => 0,
1290 %arg 1507 %arg
1291 ); 1508 );
1292 1509
1293 if (exists $self->{template}) { 1510 if (exists $self->{template}) {
1303 } 1520 }
1304 1521
1305 $self 1522 $self
1306} 1523}
1307 1524
1308sub escape { 1525sub escape($) {
1309 local $_ = $_[1]; 1526 local $_ = $_[0];
1310 1527
1311 s/&/&amp;/g; 1528 s/&/&amp;/g;
1312 s/>/&gt;/g; 1529 s/>/&gt;/g;
1313 s/</&lt;/g; 1530 s/</&lt;/g;
1314 1531
1315 $_[1] 1532 $_
1316} 1533}
1317 1534
1318sub update { 1535sub update {
1319 my ($self) = @_; 1536 my ($self) = @_;
1320 1537
1329 $self->{text} = "T$text"; 1546 $self->{text} = "T$text";
1330 1547
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1548 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1549 $self->{layout}->set_text ($text);
1333 1550
1551 $self->realloc;
1334 $self->update; 1552 $self->update;
1335 $self->check_size;
1336} 1553}
1337 1554
1338sub set_markup { 1555sub set_markup {
1339 my ($self, $markup) = @_; 1556 my ($self, $markup) = @_;
1340 1557
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1561 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1562
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1563 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1564 $self->{layout}->set_markup ($markup);
1348 1565
1566 $self->realloc;
1349 $self->update; 1567 $self->update;
1350 $self->check_size;
1351} 1568}
1352 1569
1353sub size_request { 1570sub size_request {
1354 my ($self) = @_; 1571 my ($self) = @_;
1355 1572
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1573 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1574 $self->{layout}->set_width ($self->{max_w} || -1);
1575 $self->{layout}->set_ellipsise ($self->{ellipsise});
1576 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1577 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1578
1360 my ($w, $h) = $self->{layout}->size; 1579 my ($w, $h) = $self->{layout}->size;
1361 1580
1362 if (exists $self->{template}) { 1581 if (exists $self->{template}) {
1367 1586
1368 $w = List::Util::max $w, $w2; 1587 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1588 $h = List::Util::max $h, $h2;
1370 } 1589 }
1371 1590
1372 ( 1591 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1592}
1377 1593
1378sub size_allocate { 1594sub size_allocate {
1379 my ($self, $w, $h) = @_; 1595 my ($self, $w, $h) = @_;
1380 1596
1597 delete $self->{ox};
1598
1381 delete $self->{texture}; 1599 delete $self->{texture}
1600 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1601}
1383 1602
1384sub set_fontsize { 1603sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1604 my ($self, $fontsize) = @_;
1386 1605
1387 $self->{fontsize} = $fontsize; 1606 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1607 delete $self->{texture};
1389 1608
1390 $self->update; 1609 $self->realloc;
1391 $self->check_size;
1392} 1610}
1393 1611
1394sub _draw { 1612sub _draw {
1395 my ($self) = @_; 1613 my ($self) = @_;
1614
1615 $self->SUPER::_draw; # draw background, if applicable
1396 1616
1397 my $tex = $self->{texture} ||= do { 1617 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1618 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1619 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1620 $self->{layout}->set_width ($self->{w});
1621 $self->{layout}->set_ellipsise ($self->{ellipsise});
1622 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1623 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1624
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1625 new_from_layout CFClient::Texture $self->{layout}
1626 };
1404 1627
1628 unless (exists $self->{ox}) {
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1629 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1630 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1631 : ($self->{w} - $tex->{w}) * 0.5);
1408 1632
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1633 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1634 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1635 : ($self->{h} - $tex->{h}) * 0.5);
1412
1413 $tex
1414 }; 1636 };
1415 1637
1416 glEnable GL_TEXTURE_2D; 1638 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1639 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 1640
1444 active_fg => [0, 0, 0], 1666 active_fg => [0, 0, 0],
1445 can_hover => 1, 1667 can_hover => 1,
1446 can_focus => 1, 1668 can_focus => 1,
1447 valign => 0, 1669 valign => 0,
1448 can_events => 1, 1670 can_events => 1,
1671 #text => ...
1449 @_ 1672 @_
1450 ) 1673 )
1451} 1674}
1452 1675
1453sub _set_text { 1676sub _set_text {
1455 1678
1456 delete $self->{cur_h}; 1679 delete $self->{cur_h};
1457 1680
1458 return if $self->{text} eq $text; 1681 return if $self->{text} eq $text;
1459 1682
1460 delete $self->{texture};
1461
1462 $self->{last_activity} = $::NOW; 1683 $self->{last_activity} = $::NOW;
1463 $self->{text} = $text; 1684 $self->{text} = $text;
1464 1685
1465 $text =~ s/./*/g if $self->{hidden}; 1686 $text =~ s/./*/g if $self->{hidden};
1466 $self->{layout}->set_text ("$text "); 1687 $self->{layout}->set_text ("$text ");
1467 1688
1468 $self->emit (changed => $self->{text}); 1689 $self->_emit (changed => $self->{text});
1690 $self->update;
1469} 1691}
1470 1692
1471sub set_text { 1693sub set_text {
1472 my ($self, $text) = @_; 1694 my ($self, $text) = @_;
1473 1695
1474 $self->{cursor} = length $text; 1696 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1697 $self->_set_text ($text);
1476 $self->check_size; 1698
1477 $self->update; 1699 $self->realloc;
1478} 1700}
1479 1701
1480sub get_text { 1702sub get_text {
1481 $_[0]{text} 1703 $_[0]{text}
1482} 1704}
1485 my ($self) = @_; 1707 my ($self) = @_;
1486 1708
1487 my ($w, $h) = $self->SUPER::size_request; 1709 my ($w, $h) = $self->SUPER::size_request;
1488 1710
1489 ($w + 1, $h) # add 1 for cursor 1711 ($w + 1, $h) # add 1 for cursor
1490}
1491
1492sub size_allocate {
1493 my ($self, $w, $h) = @_;
1494
1495 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1496} 1712}
1497 1713
1498sub key_down { 1714sub key_down {
1499 my ($self, $ev) = @_; 1715 my ($self, $ev) = @_;
1500 1716
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1731 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1732 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1733 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1734 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1735 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1736 $self->_emit ('escape');
1521 } elsif ($uni) { 1737 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1738 substr $text, $self->{cursor}++, 0, chr $uni;
1739 } else {
1740 return 0;
1523 } 1741 }
1524 1742
1525 $self->_set_text ($text); 1743 $self->_set_text ($text);
1526 $self->update; 1744
1745 $self->realloc;
1746
1747 1
1527} 1748}
1528 1749
1529sub focus_in { 1750sub focus_in {
1530 my ($self) = @_; 1751 my ($self) = @_;
1531 1752
1546 utf8::encode $text; 1767 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1768 $self->{cursor} = length substr $text, 0, $idx;
1548 1769
1549 $self->_set_text ($self->{text}); 1770 $self->_set_text ($self->{text});
1550 $self->update; 1771 $self->update;
1772
1773 1
1551} 1774}
1552 1775
1553sub mouse_motion { 1776sub mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1777 my ($self, $ev, $x, $y) = @_;
1555# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1778# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1779
1780 0
1556} 1781}
1557 1782
1558sub _draw { 1783sub _draw {
1559 my ($self) = @_; 1784 my ($self) = @_;
1560 1785
1611 if ($sym == 13) { 1836 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1837 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1838 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1839 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1840 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1841 $self->_emit (activate => $txt);
1617 $self->update; 1842 $self->update;
1618 1843
1619 } elsif ($sym == CFClient::SDLK_UP) { 1844 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1845 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1846 $self->{history_saveback} = $self->get_text;
1637 } else { 1862 } else {
1638 $self->set_text ($self->{history_saveback}); 1863 $self->set_text ($self->{history_saveback});
1639 } 1864 }
1640 1865
1641 } else { 1866 } else {
1642 $self->SUPER::key_down ($ev); 1867 return $self->SUPER::key_down ($ev)
1868 }
1869
1643 } 1870 1
1644
1645} 1871}
1646 1872
1647############################################################################# 1873#############################################################################
1648 1874
1649package CFClient::UI::Button; 1875package CFClient::UI::Button;
1658 1884
1659sub new { 1885sub new {
1660 my $class = shift; 1886 my $class = shift;
1661 1887
1662 $class->SUPER::new ( 1888 $class->SUPER::new (
1663 padding => 4, 1889 padding_x => 4,
1890 padding_y => 4,
1664 fg => [1, 1, 1], 1891 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1892 active_fg => [0, 0, 1],
1667 can_hover => 1, 1893 can_hover => 1,
1668 align => 0, 1894 align => 0,
1669 valign => 0, 1895 valign => 0,
1670 can_events => 1, 1896 can_events => 1,
1671 @_ 1897 @_
1672 ) 1898 )
1673} 1899}
1674 1900
1901sub activate { }
1902
1675sub button_up { 1903sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1904 my ($self, $ev, $x, $y) = @_;
1677 1905
1906 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1907 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1908 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1909
1681 } 1910 1
1682} 1911}
1683 1912
1684sub _draw { 1913sub _draw {
1685 my ($self) = @_; 1914 my ($self) = @_;
1686 1915
1715 1944
1716sub new { 1945sub new {
1717 my $class = shift; 1946 my $class = shift;
1718 1947
1719 $class->SUPER::new ( 1948 $class->SUPER::new (
1720 padding => 2, 1949 padding_x => 2,
1950 padding_y => 2,
1721 fg => [1, 1, 1], 1951 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1952 active_fg => [1, 1, 0],
1953 bg => [0, 0, 0, 0.2],
1954 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1955 state => 0,
1724 can_hover => 1, 1956 can_hover => 1,
1725 @_ 1957 @_
1726 ) 1958 )
1727} 1959}
1728 1960
1729sub size_request { 1961sub size_request {
1730 my ($self) = @_; 1962 my ($self) = @_;
1731 1963
1732 ($self->{padding} * 2 + 6) x 2 1964 (6) x 2
1733} 1965}
1734 1966
1735sub button_down { 1967sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1968 my ($self, $ev, $x, $y) = @_;
1737 1969
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1970 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1971 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1972 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1973 $self->_emit (changed => $self->{state});
1974 } else {
1975 return 0
1976 }
1977
1742 } 1978 1
1743} 1979}
1744 1980
1745sub _draw { 1981sub _draw {
1746 my ($self) = @_; 1982 my ($self) = @_;
1747 1983
1748 $self->SUPER::_draw; 1984 $self->SUPER::_draw;
1749 1985
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1986 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1987
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1988 my ($w, $h) = @$self{qw(w h)};
1989
1990 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1991
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1992 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1993
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1994 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1995
2011 qw(s1_slider.png s1_slider_bg.png); 2249 qw(s1_slider.png s1_slider_bg.png);
2012 2250
2013sub new { 2251sub new {
2014 my $class = shift; 2252 my $class = shift;
2015 2253
2016 # range [value, low, high, page] 2254 # range [value, low, high, page, unit]
2017 2255
2018 # TODO: 0-width page 2256 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2257 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2258 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2259 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2260 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2261 active_fg => [0, 0, 0],
2262 bg => [0, 0, 0, 0.2],
2263 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2264 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2265 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2266 min_h => $::WIDTH / 80,
2027 vertical => 0, 2267 vertical => 0,
2028 can_hover => 1, 2268 can_hover => 1,
2029 inner_pad => 5, 2269 inner_pad => 0.02,
2030 @_ 2270 @_
2031 ); 2271 );
2032 2272
2273 $self->set_value ($self->{range}[0]);
2274 $self->update;
2275
2033 $self 2276 $self
2034} 2277}
2035 2278
2279sub changed { }
2280
2281sub set_range {
2282 my ($self, $range) = @_;
2283
2284 ($range, $self->{range}) = ($self->{range}, $range);
2285
2286 $self->update
2287 if "@$range" ne "@{$self->{range}}";
2288}
2289
2290sub set_value {
2291 my ($self, $value) = @_;
2292
2293 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2294
2295 $hi = $lo + 1 if $hi <= $lo;
2296
2297 $page = $hi - $lo if $page > $hi - $lo;
2298
2299 $value = $lo if $value < $lo;
2300 $value = $hi - $page if $value > $hi - $page;
2301
2302 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2303 if $unit;
2304
2305 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2306
2307 if ($value != $old_value) {
2308 $self->_emit (changed => $value);
2309 $self->update;
2310 }
2311}
2312
2036sub size_request { 2313sub size_request {
2037 my ($self) = @_; 2314 my ($self) = @_;
2038 2315
2039 my $w = $self->{req_w}; 2316 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2317}
2044 2318
2045sub button_down { 2319sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2320 my ($self, $ev, $x, $y) = @_;
2047 2321
2048 $self->SUPER::button_down ($ev, $x, $y); 2322 $self->SUPER::button_down ($ev, $x, $y);
2323
2324 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2325
2049 $self->mouse_motion ($ev, $x, $y); 2326 $self->mouse_motion ($ev, $x, $y)
2050} 2327}
2051 2328
2052sub mouse_motion { 2329sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2330 my ($self, $ev, $x, $y) = @_;
2054 2331
2055 if ($GRAB == $self) { 2332 if ($GRAB == $self) {
2333 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2334
2335 my (undef, $lo, $hi, $page) = @{$self->{range}};
2336
2337 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2338
2339 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2340 } else {
2341 return 0;
2342 }
2343
2344 1
2345}
2346
2347sub update {
2348 my ($self) = @_;
2349
2350 delete $self->{knob_w};
2351 $self->SUPER::update;
2352}
2353
2354sub _draw {
2355 my ($self) = @_;
2356
2357 unless ($self->{knob_w}) {
2358 $self->set_value ($self->{range}[0]);
2359
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2360 my ($value, $lo, $hi, $page) = @{$self->{range}};
2361 my $range = ($hi - $page - $lo) || 1e-100;
2057 2362
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2363 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2364
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2365 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2061 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2366 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2367
2063 $x -= $inner_pad_px; # substract the padding 2368 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2369 $value = $value * $self->{scale} + $self->{offset};
2065 $x = $lo if $x < $lo;
2066 $x = $hi - $page if $x > $hi - $page;
2067 $self->{range}[0] = $x;
2068 2370
2069 $self->emit (changed => $x); 2371 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2372 $self->{knob_w} = $knob_w;
2071 } 2373 }
2072}
2073
2074# the inner_* stuff is for generating a padding for the slider handle,
2075# so that the handle doesn't leave the texture. This calculation isn't 100%
2076# correct propably, but it does the job for now
2077sub _calc_inner_pad_px {
2078 my ($self, $w) = @_;
2079 ($w / 100) * $self->{inner_pad} # % to pixels
2080}
2081
2082sub _draw {
2083 my ($self) = @_;
2084 2374
2085 $self->SUPER::_draw (); 2375 $self->SUPER::_draw ();
2086 2376
2087 my ($w, $h) = @$self{qw(w h)}; 2377 glScale $self->{w}, $self->{h};
2088 2378
2089 if ($self->{vertical}) { 2379 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2380 # draw a vertical slider like a rotated horizontal slider
2091 2381
2382 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2383 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2384 }
2097 2385
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2386 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2387 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2388
2101 my ($value, $lo, $hi, $page) = @{$self->{range}};
2102
2103 $hi = $value + 1 if $lo == $hi;
2104
2105 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2106 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2107
2108 $page = int $page * $inner_w / ($hi - $lo);
2109 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2110
2111 $w -= $page;
2112 $page &= ~1;
2113 glTranslate $page * 0.5, 0, 0;
2114 $page ||= 2;
2115
2116 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2117 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2118
2119 glEnable GL_TEXTURE_2D; 2389 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2390 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2391
2122 # draw background 2392 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2393 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2394
2125 # draw handle 2395 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2396 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2397
2128 glDisable GL_TEXTURE_2D; 2398 glDisable GL_TEXTURE_2D;
2129} 2399}
2400
2401#############################################################################
2402
2403package CFClient::UI::ValSlider;
2404
2405our @ISA = CFClient::UI::HBox::;
2406
2407sub new {
2408 my ($class, %arg) = @_;
2409
2410 my $range = delete $arg{range};
2411
2412 my $self = $class->SUPER::new (
2413 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2414 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2415 to_value => sub { shift },
2416 from_value => sub { shift },
2417 %arg,
2418 );
2419
2420 $self->{slider}->connect (changed => sub {
2421 my ($self, $value) = @_;
2422 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2423 $self->{parent}->emit (changed => $value);
2424 });
2425
2426# $self->{entry}->connect (changed => sub {
2427# my ($self, $value) = @_;
2428# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2429# $self->{parent}->emit (changed => $value);
2430# });
2431
2432 $self->add ($self->{slider}, $self->{entry});
2433
2434 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2435
2436 $self
2437}
2438
2439sub set_range { shift->{slider}->set_range (@_) }
2440sub set_value { shift->{slider}->set_value (@_) }
2130 2441
2131############################################################################# 2442#############################################################################
2132 2443
2133package CFClient::UI::TextView; 2444package CFClient::UI::TextView;
2134 2445
2164 2475
2165 $self->{fontsize} = $fontsize; 2476 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2477 $self->reflow;
2167} 2478}
2168 2479
2169sub text_height {
2170 my ($self, $text) = @_;
2171
2172 my $layout = $self->{layout};
2173
2174 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2175 $layout->set_width ($self->{children}[0]{w});
2176 $layout->set_markup ($text);
2177
2178 ($layout->size)[1]
2179}
2180
2181sub reflow {
2182 my ($self) = @_;
2183
2184 $self->{need_reflow}++;
2185 $self->update;
2186}
2187
2188sub size_allocate { 2480sub size_allocate {
2189 my ($self, $w, $h) = @_; 2481 my ($self, $w, $h) = @_;
2190 2482
2191 $self->SUPER::size_allocate ($w, $h); 2483 $self->SUPER::size_allocate ($w, $h);
2192 2484
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2487 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2488
2197 $self->reflow; 2489 $self->reflow;
2198} 2490}
2199 2491
2492sub text_size {
2493 my ($self, $text, $indent) = @_;
2494
2495 my $layout = $self->{layout};
2496
2497 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2498 $layout->set_width ($self->{children}[0]{w} - $indent);
2499 $layout->set_markup ($text);
2500
2501 $layout->size
2502}
2503
2504sub reflow {
2505 my ($self) = @_;
2506
2507 $self->{need_reflow}++;
2508 $self->update;
2509}
2510
2511sub set_offset {
2512 my ($self, $offset) = @_;
2513
2514 # todo: base offset on lines or so, not on pixels
2515 $self->{children}[1]->set_value ($offset);
2516}
2517
2518sub clear {
2519 my ($self) = @_;
2520
2521 $self->{par} = [];
2522 $self->{height} = 0;
2523 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2524}
2525
2200sub add_paragraph { 2526sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2527 my ($self, $color, $text, $indent) = @_;
2202 2528
2203 #TODO: intelligently "reformat" paragraph 2529 for my $line (split /\n/, $text) {
2204 2530 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2531 $self->{height} += $h;
2532 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2533 }
2208 2534
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2535 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2536}
2214 2537
2215sub update { 2538sub update {
2216 my ($self) = @_; 2539 my ($self) = @_;
2217 2540
2220 return unless $self->{h} > 0; 2543 return unless $self->{h} > 0;
2221 2544
2222 delete $self->{texture}; 2545 delete $self->{texture};
2223 2546
2224 $ROOT->on_post_alloc ($self, sub { 2547 $ROOT->on_post_alloc ($self, sub {
2548 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2549
2225 if (delete $self->{need_reflow}) { 2550 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2551 my $height = 0;
2227 2552
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2553 my $layout = $self->{layout};
2554
2555 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2556
2229 for @{$self->{par}}; 2557 for (@{$self->{par}}) {
2558 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2559 $layout->set_width ($W - $_->[3]);
2560 $layout->set_markup ($_->[4]);
2561 my ($w, $h) = $layout->size;
2562 $_->[0] = $w + $_->[3];
2563 $_->[1] = $h;
2564 }
2565
2566 $height += $_->[1];
2567 }
2230 2568
2231 $self->{height} = $height; 2569 $self->{height} = $height;
2232 2570
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2571 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2572
2235 delete $self->{texture}; 2573 delete $self->{texture};
2236 } 2574 }
2237 2575
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2576 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2577 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2578 glClear GL_COLOR_BUFFER_BIT;
2241 2579
2242 glEnable GL_TEXTURE_2D;
2243 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2244
2245 my $top = int $self->{children}[1]{range}[0]; 2580 my $top = int $self->{children}[1]{range}[0];
2246 2581
2247 my $y0 = $top; 2582 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2583 my $y1 = $top + $H;
2249 2584
2250 my $y = 0; 2585 my $y = 0;
2251 2586
2252 my $layout = $self->{layout}; 2587 my $layout = $self->{layout};
2253 2588
2254 $layout->set_font ($self->{font}) if $self->{font}; 2589 $layout->set_font ($self->{font}) if $self->{font};
2255 2590
2591 glEnable GL_BLEND;
2592 #TODO# not correct in windows where rgba is forced off
2593 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2594
2256 for my $par (@{$self->{par}}) { 2595 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2596 my $h = $par->[1];
2258 2597
2259 if ($y0 < $y + $h && $y < $y1) { 2598 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2599 $layout->set_foreground (@{ $par->[2] });
2600 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2601 $layout->set_markup ($par->[4]);
2262 2602
2263 my ($W, $H) = $layout->size; 2603 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2604
2605 glRasterPos $par->[3], $y - $y0;
2606 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2607 }
2266 2608
2267 $y += $h; 2609 $y += $h;
2268 } 2610 }
2269 2611
2270 glDisable GL_TEXTURE_2D; 2612 glDisable GL_BLEND;
2271 }; 2613 };
2272 }); 2614 });
2273} 2615}
2274 2616
2275sub _draw { 2617sub _draw {
2276 my ($self) = @_; 2618 my ($self) = @_;
2277 2619
2278 glEnable GL_TEXTURE_2D; 2620 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2621 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2622 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2623 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2624 glDisable GL_TEXTURE_2D;
2283 2625
2284 $self->{children}[1]->draw; 2626 $self->{children}[1]->draw;
2285 2627
2286} 2628}
2335 2677
2336sub new { 2678sub new {
2337 my $class = shift; 2679 my $class = shift;
2338 2680
2339 my $self = $class->SUPER::new ( 2681 my $self = $class->SUPER::new (
2340 state => 0, 2682 state => 0,
2341 connect_activate => \&toggle_flopper, 2683 on_activate => \&toggle_flopper,
2342 @_ 2684 @_
2343 ); 2685 );
2344 2686
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2687 $self
2351} 2688}
2352 2689
2353sub toggle_flopper { 2690sub toggle_flopper {
2354 my ($self) = @_; 2691 my ($self) = @_;
2355 2692
2356 # TODO: use animation 2693 $self->{other}->toggle_visibility;
2357 if ($self->{state} = !$self->{state}) {
2358 $CFClient::UI::ROOT->add ($self->{other});
2359 $self->{other}->move ($self->coord2global (0, $self->{h}));
2360 $self->emit ("open");
2361 } else {
2362 $CFClient::UI::ROOT->remove ($self->{other});
2363 $self->emit ("close");
2364 }
2365
2366 $self->emit (changed => $self->{state});
2367} 2694}
2368 2695
2369############################################################################# 2696#############################################################################
2370 2697
2371package CFClient::UI::Tooltip; 2698package CFClient::UI::Tooltip;
2384} 2711}
2385 2712
2386sub set_tooltip_from { 2713sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2714 my ($self, $widget) = @_;
2388 2715
2716 my $tooltip = $widget->{tooltip};
2717
2718 if ($ENV{CFPLUS_DEBUG} & 2) {
2719 $tooltip .= "\n\n" . (ref $widget) . "\n"
2720 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2721 . "req $widget->{req_w} $widget->{req_h}\n"
2722 . "visible $widget->{visible}";
2723 }
2724
2389 $self->add (new CFClient::UI::Label 2725 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2726 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2727 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2728 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2729 fg => [0, 0, 0, 1],
2730 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2731 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2732 );
2396} 2733}
2397 2734
2398sub size_request { 2735sub size_request {
2399 my ($self) = @_; 2736 my ($self) = @_;
2405 2742
2406sub size_allocate { 2743sub size_allocate {
2407 my ($self, $w, $h) = @_; 2744 my ($self, $w, $h) = @_;
2408 2745
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 2746 $self->SUPER::size_allocate ($w - 4, $h - 4);
2747}
2748
2749sub visibility_change {
2750 my ($self, $visible) = @_;
2751
2752 return unless $visible;
2753
2754 $self->{root}->on_post_alloc ("move_$self" => sub {
2755 my $widget = $self->{owner}
2756 or return;
2757
2758 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2759
2760 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2761 if $x + $self->{w} > $::WIDTH;
2762
2763 $self->move_abs ($x, $y);
2764 });
2410} 2765}
2411 2766
2412sub _draw { 2767sub _draw {
2413 my ($self) = @_; 2768 my ($self) = @_;
2414 2769
2431 glVertex $w, $h; 2786 glVertex $w, $h;
2432 glVertex $w, 0; 2787 glVertex $w, 0;
2433 glEnd; 2788 glEnd;
2434 2789
2435 glTranslate 2 - 0.375, 2 - 0.375; 2790 glTranslate 2 - 0.375, 2 - 0.375;
2791
2436 $self->SUPER::_draw; 2792 $self->SUPER::_draw;
2437} 2793}
2438 2794
2439############################################################################# 2795#############################################################################
2440 2796
2445use CFClient::OpenGL; 2801use CFClient::OpenGL;
2446 2802
2447sub new { 2803sub new {
2448 my $class = shift; 2804 my $class = shift;
2449 2805
2450 $class->SUPER::new ( 2806 my $self = $class->SUPER::new (
2451 aspect => 1, 2807 aspect => 1,
2808 can_events => 0,
2452 @_, 2809 @_,
2453 ) 2810 );
2811
2812 if ($self->{anim} && $self->{animspeed}) {
2813 Scalar::Util::weaken (my $widget = $self);
2814
2815 $self->{timer} = Event->timer (
2816 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2817 hard => 1,
2818 interval => $self->{animspeed},
2819 cb => sub {
2820 ++$widget->{frame};
2821 $widget->update;
2822 },
2823 );
2824 }
2825
2826 $self
2454} 2827}
2455 2828
2456sub size_request { 2829sub size_request {
2457 (32, 8) 2830 (32, 8)
2458} 2831}
2459 2832
2833sub update {
2834 my ($self) = @_;
2835
2836 return unless $self->{visible};
2837
2838 $self->SUPER::update;
2839}
2840
2460sub _draw { 2841sub _draw {
2461 my ($self) = @_; 2842 my ($self) = @_;
2462 2843
2463 return unless $::CONN;#d# manage and cache textures differently 2844 return unless $::CONN;
2845
2846 my $face;
2847
2848 if ($self->{frame}) {
2849 my $anim = $::CONN->{anim}[$self->{anim}];
2850
2851 $face = $anim->[ $self->{frame} % @$anim ]
2852 if $anim && @$anim;
2853 }
2854
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2855 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2856
2466 # TODO animation
2467 if ($tex) { 2857 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2858 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2859 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2860 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2861 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2862 glDisable GL_TEXTURE_2D;
2473 } 2863 }
2474} 2864}
2475 2865
2866sub DESTROY {
2867 my ($self) = @_;
2868
2869 $self->{timer}->cancel
2870 if $self->{timer};
2871
2872 $self->SUPER::DESTROY;
2873}
2874
2476############################################################################# 2875#############################################################################
2477 2876
2478package CFClient::UI::InventoryItem; 2877package CFClient::UI::Buttonbar;
2479 2878
2480our @ISA = CFClient::UI::HBox::; 2879our @ISA = CFClient::UI::HBox::;
2481 2880
2482sub new { 2881# TODO: should actualyl wrap buttons and other goodies.
2483 my $class = shift;
2484
2485 my %args = @_;
2486
2487 my $item = delete $args{item};
2488
2489 my $desc = $item->{nrof} < 2
2490 ? $item->{name}
2491 : "$item->{nrof} $item->{name_pl}";
2492
2493
2494 my $self = $class->SUPER::new (
2495 can_hover => 1,
2496 can_events => 1,
2497 tooltip => (CFClient::UI::Label->escape ($desc)
2498 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2499 connect_button_down => sub {
2500 my ($self, $ev, $x, $y) = @_;
2501
2502 # todo: maybe put examine on 1? but should just be a tooltip :(
2503 if ($ev->{button} == 1) {
2504 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2505 } elsif ($ev->{button} == 2) {
2506 $::CONN->send ("apply $item->{tag}");
2507 } elsif ($ev->{button} == 3) {
2508 CFClient::UI::Menu->new (
2509 items => [
2510 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2511 [
2512 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2513 sub { $::CONN->send ("lock $item->{tag}") },
2514 ],
2515 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2516 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2517 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2518 ],
2519 )->popup ($ev);
2520 }
2521
2522 1
2523 },
2524 %args
2525 );
2526
2527 $self->add (new CFClient::UI::Face
2528 can_events => 0,
2529 face => $item->{face},
2530 anim => $item->{anim},
2531 animspeed => $item->{animspeed},
2532 );
2533
2534 $self->add (new CFClient::UI::Label
2535 can_events => 0,
2536 text => $desc,
2537 );
2538
2539 $self
2540}
2541
2542#############################################################################
2543
2544package CFClient::UI::Inventory;
2545
2546our @ISA = CFClient::UI::ScrolledWindow::;
2547
2548sub new {
2549 my $class = shift;
2550
2551 my $self = $class->SUPER::new (
2552 scrolled => (new CFClient::UI::VBox),
2553 @_,
2554 );
2555
2556 $self
2557}
2558
2559sub set_items {
2560 my ($self, $items) = @_;
2561
2562 $self->{scrolled}->clear;
2563 return unless $items;
2564
2565 my @items = sort {
2566 ($a->{type} <=> $b->{type})
2567 or ($a->{name} cmp $b->{name})
2568 } @$items;
2569
2570 $self->{real_items} = \@items;
2571
2572 for my $item (@items) {
2573 my $desc = $item->{nrof} < 2
2574 ? $item->{name}
2575 : "$item->{nrof} $item->{name_pl}";
2576
2577 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2578 }
2579
2580 $self->{scrolled}->add (@items);
2581
2582# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2583}
2584
2585sub size_request {
2586 my ($self) = @_;
2587 ($self->{req_w}, $self->{req_h});
2588}
2589 2882
2590############################################################################# 2883#############################################################################
2591 2884
2592package CFClient::UI::Menu; 2885package CFClient::UI::Menu;
2593 2886
2627 2920
2628# popup given the event (must be a mouse button down event currently) 2921# popup given the event (must be a mouse button down event currently)
2629sub popup { 2922sub popup {
2630 my ($self, $ev) = @_; 2923 my ($self, $ev) = @_;
2631 2924
2632 $self->emit ("popdown"); 2925 $self->_emit ("popdown");
2633 2926
2634 # maybe save $GRAB? must be careful about events... 2927 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2928 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2929 $self->{button} = $ev->{button};
2637 2930
2638 $self->show; 2931 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2932 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 2933}
2641 2934
2642sub mouse_motion { 2935sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2936 my ($self, $ev, $x, $y) = @_;
2644 2937
2645 # TODO: should use vbox->find_widget or so 2938 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2939 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 2940 $self->{hover} = $self->{item}{$HOVER};
2941
2942 0
2648} 2943}
2649 2944
2650sub button_up { 2945sub button_up {
2651 my ($self, $ev, $x, $y) = @_; 2946 my ($self, $ev, $x, $y) = @_;
2652 2947
2653 if ($ev->{button} == $self->{button}) { 2948 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2949 undef $GRAB;
2655 $self->hide; 2950 $self->hide;
2656 2951
2657 $self->emit ("popdown"); 2952 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2953 $self->{hover}[1]->() if $self->{hover};
2954 } else {
2955 return 0
2956 }
2957
2659 } 2958 1
2660} 2959}
2661 2960
2662############################################################################# 2961#############################################################################
2663 2962
2963package CFClient::UI::Multiplexer;
2964
2965our @ISA = CFClient::UI::Container::;
2966
2967sub new {
2968 my $class = shift;
2969
2970 my $self = $class->SUPER::new (
2971 @_,
2972 );
2973
2974 $self->{current} = $self->{children}[0]
2975 if @{ $self->{children} };
2976
2977 $self
2978}
2979
2980sub add {
2981 my ($self, @widgets) = @_;
2982
2983 $self->SUPER::add (@widgets);
2984
2985 $self->{current} = $self->{children}[0]
2986 if @{ $self->{children} };
2987}
2988
2989sub set_current_page {
2990 my ($self, $page_or_widget) = @_;
2991
2992 my $widget = ref $page_or_widget
2993 ? $page_or_widget
2994 : $self->{children}[$page_or_widget];
2995
2996 $self->{current} = $widget;
2997 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2998
2999 $self->_emit (page_changed => $self->{current});
3000
3001 $self->realloc;
3002}
3003
3004sub visible_children {
3005 $_[0]{current}
3006}
3007
3008sub size_request {
3009 my ($self) = @_;
3010
3011 $self->{current}->size_request
3012}
3013
3014sub size_allocate {
3015 my ($self, $w, $h) = @_;
3016
3017 $self->{current}->configure (0, 0, $w, $h);
3018}
3019
3020sub _draw {
3021 my ($self) = @_;
3022
3023 $self->{current}->draw;
3024}
3025
3026#############################################################################
3027
3028package CFClient::UI::Notebook;
3029
3030our @ISA = CFClient::UI::VBox::;
3031
3032sub new {
3033 my $class = shift;
3034
3035 my $self = $class->SUPER::new (
3036 buttonbar => (new CFClient::UI::Buttonbar),
3037 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3038 # filter => # will be put between multiplexer and $self
3039 @_,
3040 );
3041
3042 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3043 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3044
3045 $self
3046}
3047
3048sub add {
3049 my ($self, $title, $widget, $tooltip) = @_;
3050
3051 Scalar::Util::weaken $self;
3052
3053 $self->{buttonbar}->add (new CFClient::UI::Button
3054 markup => $title,
3055 tooltip => $tooltip,
3056 on_activate => sub { $self->set_current_page ($widget) },
3057 );
3058
3059 $self->{multiplexer}->add ($widget);
3060}
3061
3062sub set_current_page {
3063 my ($self, $page) = @_;
3064
3065 $self->{multiplexer}->set_current_page ($page);
3066 $self->_emit (page_changed => $self->{multiplexer}{current});
3067}
3068
3069#############################################################################
3070
2664package CFClient::UI::Statusbox; 3071package CFClient::UI::Statusbox;
2665 3072
2666our @ISA = CFClient::UI::VBox::; 3073our @ISA = CFClient::UI::VBox::;
3074
3075sub new {
3076 my $class = shift;
3077
3078 $class->SUPER::new (
3079 fontsize => 0.8,
3080 @_,
3081 )
3082}
2667 3083
2668sub reorder { 3084sub reorder {
2669 my ($self) = @_; 3085 my ($self) = @_;
2670 my $NOW = time; 3086 my $NOW = time;
2671 3087
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3106 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3107 : $item->{text};
2692 3108
2693 for ($short) { 3109 for ($short) {
2694 s/^\s+//; 3110 s/^\s+//;
2695 s/\012.*/…/s; 3111 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3112 }
2699 3113
2700 new CFClient::UI::Label 3114 new CFClient::UI::Label
2701 markup => $short, 3115 markup => $short,
2702 tooltip => $item->{tooltip}, 3116 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3117 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3118 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3119 fontsize => $item->{fontsize} || $self->{fontsize},
3120 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 3121 fg => $item->{fg},
2707 can_events => 1, 3122 can_events => 1,
2708 can_hover => 1 3123 can_hover => 1
2709 }; 3124 };
2710 } 3125 }
2711 3126
2716sub add { 3131sub add {
2717 my ($self, $text, %arg) = @_; 3132 my ($self, $text, %arg) = @_;
2718 3133
2719 $text =~ s/^\s+//; 3134 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3135 $text =~ s/\s+$//;
3136
3137 return unless $text;
2721 3138
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3139 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 3140
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3141 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3142
2737 $self->{item}{$group} = { 3154 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3155 id => ++$self->{id},
2739 text => $text, 3156 text => $text,
2740 timeout => $timeout, 3157 timeout => $timeout,
2741 tooltip => $text, 3158 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3159 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3160 pri => 0,
2745 count => 1, 3161 count => 1,
2746 %arg, 3162 %arg,
2747 }; 3163 };
2748 } 3164 }
2749 3165
2750 $self->reorder; 3166 $self->reorder;
2751} 3167}
2752 3168
3169sub reconfigure {
3170 my ($self) = @_;
3171
3172 delete $_->{label}
3173 for values %{ $self->{item} || {} };
3174
3175 $self->reorder;
3176 $self->SUPER::reconfigure;
3177}
3178
2753############################################################################# 3179#############################################################################
2754 3180
2755package CFClient::UI::Root; 3181package CFClient::UI::Inventory;
2756 3182
2757our @ISA = CFClient::UI::Container::; 3183our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3184
2761sub new { 3185sub new {
2762 my $class = shift; 3186 my $class = shift;
2763 3187
2764 $class->SUPER::new ( 3188 my $self = $class->SUPER::new (
3189 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3190 @_,
3191 );
3192
3193 $self
3194}
3195
3196sub set_items {
3197 my ($self, $items) = @_;
3198
3199 $self->{child}->clear;
3200 return unless $items;
3201
3202 my @items = sort {
3203 ($a->{type} <=> $b->{type})
3204 or ($a->{name} cmp $b->{name})
3205 } @$items;
3206
3207 $self->{real_items} = \@items;
3208
3209 my $row = 0;
3210 for my $item (@items) {
3211 CFClient::Item::update_widgets $item;
3212
3213 $self->{child}->add (0, $row, $item->{face_widget});
3214 $self->{child}->add (1, $row, $item->{desc_widget});
3215 $self->{child}->add (2, $row, $item->{weight_widget});
3216
3217 $row++;
3218 }
3219}
3220
3221#############################################################################
3222
3223package CFClient::UI::BindEditor;
3224
3225our @ISA = CFClient::UI::FancyFrame::;
3226
3227sub new {
3228 my $class = shift;
3229
3230 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3231
3232 $self->add (my $vb = new CFClient::UI::VBox);
3233
3234
3235 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3236 text => "start recording",
3237 tooltip => "Start/Stops recording of actions."
3238 ."All subsequent actions after the recording started will be captured."
3239 ."The actions are displayed after the record was stopped."
3240 ."To bind the action you have to click on the 'Bind' button",
3241 on_activate => sub {
3242 unless ($self->{recording}) {
3243 $self->start;
3244 } else {
3245 $self->stop;
3246 }
3247 });
3248
3249 $vb->add (new CFClient::UI::Label text => "Actions:");
3250 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3251
3252 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3253 $vb->add (my $hb = new CFClient::UI::HBox);
3254 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3255 $hb->add (new CFClient::UI::Button
3256 text => "bind",
3257 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3258 on_activate => sub {
3259 $self->ask_for_bind;
3260 });
3261
3262 $vb->add (my $hb = new CFClient::UI::HBox);
3263 $hb->add (new CFClient::UI::Button
3264 text => "ok",
3265 expand => 1,
3266 tooltip => "This closes the binding editor and saves the binding",
3267 on_activate => sub {
3268 $self->hide;
3269 $self->commit;
3270 });
3271
3272 $hb->add (new CFClient::UI::Button
3273 text => "cancel",
3274 expand => 1,
3275 tooltip => "This closes the binding editor without saving",
3276 on_activate => sub {
3277 $self->hide;
3278 $self->{binding_cancel}->()
3279 if $self->{binding_cancel};
3280 });
3281
3282 $self->update_binding_widgets;
3283
3284 $self
3285}
3286
3287sub commit {
3288 my ($self) = @_;
3289 my ($mod, $sym, $cmds) = $self->get_binding;
3290 if ($sym != 0 && @$cmds > 0) {
3291 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3292 ."'. Don't forget 'Save Config'!");
3293 $self->{binding_change}->($mod, $sym, $cmds)
3294 if $self->{binding_change};
3295 } else {
3296 $::STATUSBOX->add ("No action bound, no key or action specified!");
3297 $self->{binding_cancel}->()
3298 if $self->{binding_cancel};
3299 }
3300}
3301
3302sub start {
3303 my ($self) = @_;
3304
3305 $self->{rec_btn}->set_text ("stop recording");
3306 $self->{recording} = 1;
3307 $self->clear_command_list;
3308 $::CONN->start_record if $::CONN;
3309}
3310
3311sub stop {
3312 my ($self) = @_;
3313
3314 $self->{rec_btn}->set_text ("start recording");
3315 $self->{recording} = 0;
3316
3317 my $rec;
3318 $rec = $::CONN->stop_record if $::CONN;
3319 return unless ref $rec eq 'ARRAY';
3320 $self->set_command_list ($rec);
3321}
3322
3323
3324sub ask_for_bind_and_commit {
3325 my ($self) = @_;
3326 $self->ask_for_bind (1);
3327}
3328
3329sub ask_for_bind {
3330 my ($self, $commit) = @_;
3331
3332 CFClient::Binder::open_binding_dialog (sub {
3333 my ($mod, $sym) = @_;
3334 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3335 $self->update_binding_widgets;
3336 $self->commit if $commit;
3337 });
3338}
3339
3340# $mod and $sym are the modifiers and key symbol
3341# $cmds is a array ref of strings (the commands)
3342# $cb is the callback that is executed on OK
3343# $ccb is the callback that is executed on CANCEL and
3344# when the binding was unsuccessful on OK
3345sub set_binding {
3346 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3347
3348 $self->clear_command_list;
3349 $self->{recording} = 0;
3350 $self->{rec_btn}->set_text ("start recording");
3351
3352 $self->{binding} = [$mod, $sym];
3353 $self->{commands} = $cmds;
3354
3355 $self->{binding_change} = $cb;
3356 $self->{binding_cancel} = $ccb;
3357
3358 $self->update_binding_widgets;
3359}
3360
3361# this is a shortcut method that asks for a binding
3362# and then just binds it.
3363sub do_quick_binding {
3364 my ($self, $cmds) = @_;
3365 $self->set_binding (undef, undef, $cmds, sub {
3366 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3367 });
3368 $self->ask_for_bind (1);
3369}
3370
3371sub update_binding_widgets {
3372 my ($self) = @_;
3373 my ($mod, $sym, $cmds) = $self->get_binding;
3374 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3375 $self->set_command_list ($cmds);
3376}
3377
3378sub get_binding {
3379 my ($self) = @_;
3380 return (
3381 $self->{binding}->[0],
3382 $self->{binding}->[1],
3383 [ grep { defined $_ } @{$self->{commands}} ]
3384 );
3385}
3386
3387sub clear_command_list {
3388 my ($self) = @_;
3389 $self->{cmdbox}->clear ();
3390}
3391
3392sub set_command_list {
3393 my ($self, $cmds) = @_;
3394
3395 $self->{cmdbox}->clear ();
3396 $self->{commands} = $cmds;
3397
3398 my $idx = 0;
3399
3400 for (@$cmds) {
3401 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3402
3403 my $i = $idx;
3404 $hb->add (new CFClient::UI::Label text => $_);
3405 $hb->add (new CFClient::UI::Button
3406 text => "delete",
3407 tooltip => "Deletes the action from the record",
3408 on_activate => sub {
3409 $self->{cmdbox}->remove ($hb);
3410 $cmds->[$i] = undef;
3411 });
3412
3413
3414 $idx++
3415 }
3416}
3417
3418#############################################################################
3419
3420package CFClient::UI::SpellList;
3421
3422our @ISA = CFClient::UI::Table::;
3423
3424sub new {
3425 my $class = shift;
3426
3427 my $self = $class->SUPER::new (
3428 binding => [],
3429 commands => [],
2765 @_, 3430 @_,
2766 ) 3431 )
2767} 3432}
2768 3433
2769sub configure { 3434# XXX: Do sorting? Argl...
2770 my ($self, $x, $y, $w, $h) = @_; 3435sub add_spell {
2771
2772 $self->{w} = $w;
2773 $self->{h} = $h;
2774}
2775
2776sub check_size {
2777 my ($self) = @_; 3436 my ($self, $spell) = @_;
3437 $self->{spells}->{$spell->{name}} = $spell;
2778 3438
2779 $self->size_allocate ($self->{w}, $self->{h}) 3439 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2780 if $self->{w}; 3440 face => $spell->{face},
3441 can_hover => 1,
3442 can_events => 1,
3443 tooltip => $spell->{message});
3444
3445 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3446 text => $spell->{name},
3447 can_hover => 1,
3448 can_events => 1,
3449 tooltip => $spell->{message},
3450 expand => 1);
3451
3452 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3453 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3454 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3455 expand => 1);
3456
3457 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3458 text => "bind to key",
3459 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3460}
3461
3462sub rebuild_spell_list {
3463 my ($self) = @_;
3464 $self->{tbl_idx} = 0;
3465 $self->add_spell ($_) for values %{$self->{spells}};
3466}
3467
3468sub remove_spell {
3469 my ($self, $spell) = @_;
3470 delete $self->{spells}->{$spell->{name}};
3471 $self->rebuild_spell_list;
3472}
3473
3474#############################################################################
3475
3476package CFClient::UI::Root;
3477
3478our @ISA = CFClient::UI::Container::;
3479
3480use CFClient::OpenGL;
3481
3482sub new {
3483 my $class = shift;
3484
3485 my $self = $class->SUPER::new (
3486 visible => 1,
3487 @_,
3488 );
3489
3490 Scalar::Util::weaken ($self->{root} = $self);
3491
3492 $self
2781} 3493}
2782 3494
2783sub size_request { 3495sub size_request {
2784 my ($self) = @_; 3496 my ($self) = @_;
2785 3497
2786 ($self->{w}, $self->{h}) 3498 ($self->{w}, $self->{h})
3499}
3500
3501sub _to_pixel {
3502 my ($coord, $size, $max) = @_;
3503
3504 $coord =
3505 $coord eq "center" ? ($max - $size) * 0.5
3506 : $coord eq "max" ? $max
3507 : $coord;
3508
3509 $coord = 0 if $coord < 0;
3510 $coord = $max - $size if $coord > $max - $size;
3511
3512 int $coord + 0.5
2787} 3513}
2788 3514
2789sub size_allocate { 3515sub size_allocate {
2790 my ($self, $w, $h) = @_; 3516 my ($self, $w, $h) = @_;
2791 3517
2792 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2793 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2794
2795 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2796 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2797
2798 for my $child ($self->children) { 3518 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3519 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3520
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3521 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3522 $Y = $child->{force_y} if exists $child->{force_y};
3523
3524 $X = _to_pixel $X, $W, $self->{w};
3525 $Y = _to_pixel $Y, $H, $self->{h};
3526
2803 $child->configure ($X, $Y, $W, $H); 3527 $child->configure ($X, $Y, $W, $H);
2804 } 3528 }
2805} 3529}
2806 3530
2807sub coord2local { 3531sub coord2local {
2817} 3541}
2818 3542
2819sub update { 3543sub update {
2820 my ($self) = @_; 3544 my ($self) = @_;
2821 3545
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3546 $::WANT_REFRESH++;
2824} 3547}
2825 3548
2826sub add { 3549sub add {
2827 my ($self, @children) = @_; 3550 my ($self, @children) = @_;
2828 3551
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3552 $_->{is_toplevel} = 1
2831 3553 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3554
2837 $self->SUPER::add (@children); 3555 $self->SUPER::add (@children);
3556}
3557
3558sub remove {
3559 my ($self, @children) = @_;
3560
3561 $self->SUPER::remove (@children);
3562
3563 delete $self->{is_toplevel}
3564 for @children;
3565
3566 while (@children) {
3567 my $w = pop @children;
3568 push @children, $w->children;
3569 $w->set_invisible;
3570 }
2838} 3571}
2839 3572
2840sub on_refresh { 3573sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3574 my ($self, $id, $cb) = @_;
2842 3575
2855 while ($self->{refresh_hook}) { 3588 while ($self->{refresh_hook}) {
2856 $_->() 3589 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3590 for values %{delete $self->{refresh_hook}};
2858 } 3591 }
2859 3592
2860 if ($self->{check_size}) { 3593 if ($self->{realloc}) {
2861 my @queue = ([], []); 3594 my %queue;
3595 my @queue;
3596 my $widget;
2862 3597
2863 for (;;) { 3598 outer:
2864 if ($self->{check_size}) { 3599 while () {
2865 # heuristic: check containers last 3600 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3601 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 3602 $widget->{visible} or next; # do not resize invisible widgets
3603
3604 $queue{$widget+0}++ and next; # duplicates are common
3605
3606 push @{ $queue[$widget->{visible}] }, $widget;
3607 }
2868 } 3608 }
2869 3609
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3610 while () {
3611 @queue or last outer;
2871 3612
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3613 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3614 and last;
2874 : $widget->size_request;
2875
2876 if (delete $widget->{force_alloc}
2877 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2878 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2879 3615
3616 pop @queue;
3617 }
3618
3619 delete $queue{$widget+0};
3620
3621 my ($w, $h) = $widget->size_request;
3622
3623 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3624 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3625
3626 $w = $widget->{force_w} if exists $widget->{force_w};
3627 $h = $widget->{force_h} if exists $widget->{force_h};
3628
3629 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3630 || delete $widget->{force_realloc}) {
2880 $widget->{req_w} = $w; 3631 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3632 $widget->{req_h} = $h;
2882 3633
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3634 $self->{size_alloc}{$widget+0} = $widget;
2884 3635
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 3636 if (my $parent = $widget->{parent}) {
3637 $self->{realloc}{$parent+0} = $parent
3638 unless $queue{$parent+0};
3639
3640 $parent->{force_size_alloc} = 1;
3641 $self->{size_alloc}{$parent+0} = $parent;
3642 }
2887 } 3643 }
3644
3645 delete $self->{realloc}{$widget+0};
2888 } 3646 }
2889 } 3647 }
2890 3648
2891 while ($self->{size_alloc}) { 3649 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3650 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 3651 values %$size_alloc;
3652
3653 while () {
3654 my $widget = pop @queue || last;
3655
3656 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 3657
2895 $w = 0 if $w < 0; 3658 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3659 $h = 0 if $h < 0;
2897 3660
3661 $w = int $w + 0.5;
3662 $h = int $h + 0.5;
3663
3664 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3665 $widget->{old_w} = $widget->{w};
3666 $widget->{old_h} = $widget->{h};
3667
2898 $widget->{w} = $w; 3668 $widget->{w} = $w;
2899 $widget->{h} = $h; 3669 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3670
2901 $widget->emit (size_allocate => $w, $h); 3671 $widget->emit (size_allocate => $w, $h);
3672 }
2902 } 3673 }
2903 } 3674 }
2904 3675
2905 while ($self->{post_alloc_hook}) { 3676 while ($self->{post_alloc_hook}) {
2906 $_->() 3677 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3678 for values %{delete $self->{post_alloc_hook}};
2908 } 3679 }
2909 3680
3681
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3682 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3683 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3684 glClear GL_COLOR_BUFFER_BIT;
2913 3685
2914 glMatrixMode GL_PROJECTION; 3686 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3687 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3688 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3689 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3690 glLoadIdentity;
2919 3691
3692 {
3693 package CFClient::UI::Base;
3694
3695 ($draw_x, $draw_y, $draw_w, $draw_h) =
3696 (0, 0, $self->{w}, $self->{h});
3697 }
3698
2920 $self->_draw; 3699 $self->_draw;
2921} 3700}
2922 3701
2923############################################################################# 3702#############################################################################
2924 3703
2925package CFClient::UI; 3704package CFClient::UI;
2926 3705
2927$ROOT = new CFClient::UI::Root; 3706$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3707$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3708
29301 37091
2931 3710

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines