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.274 by root, Sat Jun 3 22:20: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
1165 $self->realloc;
932 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
933 $self->check_size;
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;
947 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
948 } 1184 1
949} 1185}
950 1186
951sub button_up { 1187sub button_up {
952 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
953 1189
954 delete $self->{motion}; 1190 !!delete $self->{motion}
955} 1191}
956 1192
957sub mouse_motion { 1193sub mouse_motion {
958 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
959 1195
960 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
961} 1199}
962 1200
963sub _draw { 1201sub _draw {
964 my ($self) = @_; 1202 my ($self) = @_;
965 1203
1204 my $child = $self->{children}[0];
1205
966 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
967 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
968 1208
969 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
970 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
971 1211
972 my $border = $self->border; 1212 my $border = $self->border;
973 1213
974 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
975 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
976 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
977 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
978 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
979 1219
980 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
981 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
982 1222
983 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
984 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
985 my $rep_y = $ch / $bg->{h}; 1226 $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); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
993 } 1228 }
994 1229
995 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
996 1231
997 $self->{title}->draw if $self->{title};
998
999 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
1000} 1238}
1001 1239
1002############################################################################# 1240#############################################################################
1003 1241
1004package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
1012sub new { 1250sub new {
1013 my $class = shift; 1251 my $class = shift;
1014 1252
1015 $class->SUPER::new ( 1253 $class->SUPER::new (
1016 col_expand => [], 1254 col_expand => [],
1017 @_ 1255 @_,
1018 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1019} 1261}
1020 1262
1021sub add { 1263sub add {
1022 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
1023 1265
1024 $child->set_parent ($self); 1266 $child->set_parent ($self);
1025 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
1026 1268
1027 $child->check_size; 1269 $self->realloc;
1028} 1270}
1029 1271
1030sub children {
1031 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1032}
1033
1034# TODO: move to container class maybe? send childs a signal on removal? 1272# TODO: move to container class maybe? send children a signal on removal?
1035sub clear { 1273sub clear {
1036 my ($self) = @_; 1274 my ($self) = @_;
1037 1275
1038 my @children = $self->children; 1276 my @children = $self->children;
1039 delete $self->{children}; 1277 delete $self->{children};
… …
1041 for (@children) { 1279 for (@children) {
1042 delete $_->{parent}; 1280 delete $_->{parent};
1043 $_->hide; 1281 $_->hide;
1044 } 1282 }
1045 1283
1046 $self->update; 1284 $self->realloc;
1047} 1285}
1048 1286
1049sub get_wh { 1287sub get_wh {
1050 my ($self) = @_; 1288 my ($self) = @_;
1051 1289
… …
1082sub size_allocate { 1320sub size_allocate {
1083 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1084 1322
1085 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1086 1324
1087 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1088 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1089 1327
1090 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1091 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1092 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1093 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1147 } 1385 }
1148} 1386}
1149 1387
1150############################################################################# 1388#############################################################################
1151 1389
1152package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1153
1154# TODO: wrap into common Box base class
1155 1391
1156our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1157 1393
1158sub size_request { 1394sub size_request {
1159 my ($self) = @_; 1395 my ($self) = @_;
1160 1396
1161 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1162 1398 ? (
1163 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1164 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1165 (List::Util::max map $_->[1], @alloc), 1401 )
1166 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1167} 1406}
1168 1407
1169sub size_allocate { 1408sub size_allocate {
1170 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1171 1410
1172 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1173
1174 my $children = $self->{children}; 1412 my $children = $self->{children};
1175 1413
1176 my @h = map $_->{req_w}, @$children; 1414 my @req;
1177 1415
1178 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1179 1417 @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 { 1418 } else {
1419 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @$children;
1420 my $req = List::Util::sum @req;
1421
1422 if ($req > $space) {
1423 # ah well, not enough space
1424 $_ *= $space / $req for @req;
1425 } else {
1184 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1185 $exp ||= 1;
1186 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1187 for (0 .. $#$children) { 1431 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 } 1432 }
1194 } 1433 }
1195 1434
1196 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1197 1436
1198 my $y = 0; 1437 my $pos = 0;
1199 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1200 my $child = $children->[$_];
1201 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1202 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1203 1441
1204 $y += $h; 1442 $pos += $alloc;
1205 } 1443 }
1206 1444
1207 1 1445 1
1208} 1446}
1209 1447
1210############################################################################# 1448#############################################################################
1211 1449
1450package CFClient::UI::HBox;
1451
1452our @ISA = CFClient::UI::Box::;
1453
1454sub new {
1455 my $class = shift;
1456
1457 $class->SUPER::new (
1458 vertical => 0,
1459 @_,
1460 )
1461}
1462
1463#############################################################################
1464
1212package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1213 1466
1214# TODO: wrap into common Box base class
1215
1216our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1217 1468
1218sub size_request { 1469sub new {
1219 my ($self) = @_; 1470 my $class = shift;
1220 1471
1221 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1222 1473 vertical => 1,
1223 ( 1474 @_,
1224 (List::Util::max map $_->[0], @alloc),
1225 (List::Util::sum map $_->[1], @alloc),
1226 ) 1475 )
1227} 1476}
1228 1477
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############################################################################# 1478#############################################################################
1269 1479
1270package CFClient::UI::Label; 1480package CFClient::UI::Label;
1271 1481
1272our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1273 1483
1274use CFClient::OpenGL; 1484use CFClient::OpenGL;
1275 1485
1276sub new { 1486sub new {
1277 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1278 1488
1279 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1280 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1281 #font => default_font 1493 #font => default_font
1282 #text => initial text 1494 #text => initial text
1283 #markup => initial narkup 1495 #markup => initial narkup
1496 #max_w => maximum pixel width
1497 ellipsise => 3, # end
1284 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1285 fontsize => 1, 1499 fontsize => 1,
1286 align => -1, 1500 align => -1,
1287 valign => -1, 1501 valign => -1,
1288 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1289 can_events => 0, 1504 can_events => 0,
1290 %arg 1505 %arg
1291 ); 1506 );
1292 1507
1293 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1303 } 1518 }
1304 1519
1305 $self 1520 $self
1306} 1521}
1307 1522
1308sub escape { 1523sub escape($) {
1309 local $_ = $_[1]; 1524 local $_ = $_[0];
1310 1525
1311 s/&/&amp;/g; 1526 s/&/&amp;/g;
1312 s/>/&gt;/g; 1527 s/>/&gt;/g;
1313 s/</&lt;/g; 1528 s/</&lt;/g;
1314 1529
1315 $_[1] 1530 $_
1316} 1531}
1317 1532
1318sub update { 1533sub update {
1319 my ($self) = @_; 1534 my ($self) = @_;
1320 1535
… …
1329 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1330 1545
1331 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1332 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1333 1548
1549 $self->realloc;
1334 $self->update; 1550 $self->update;
1335 $self->check_size;
1336} 1551}
1337 1552
1338sub set_markup { 1553sub set_markup {
1339 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1340 1555
… …
1344 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1345 1560
1346 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1561 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1347 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1348 1563
1564 $self->realloc;
1349 $self->update; 1565 $self->update;
1350 $self->check_size;
1351} 1566}
1352 1567
1353sub size_request { 1568sub size_request {
1354 my ($self) = @_; 1569 my ($self) = @_;
1355 1570
1356 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1357 $self->{layout}->set_width ($self->{max_w} || -1); 1572 $self->{layout}->set_width ($self->{max_w} || -1);
1573 $self->{layout}->set_ellipsise ($self->{ellipsise});
1574 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1358 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1359 1576
1360 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1361 1578
1362 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1367 1584
1368 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1369 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1370 } 1587 }
1371 1588
1372 ( 1589 ($w, $h)
1373 $w + $self->{padding} * 2,
1374 $h + $self->{padding} * 2,
1375 )
1376} 1590}
1377 1591
1378sub size_allocate { 1592sub size_allocate {
1379 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1380 1594
1595 delete $self->{ox};
1596
1381 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1382} 1599}
1383 1600
1384sub set_fontsize { 1601sub set_fontsize {
1385 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1386 1603
1387 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1388 delete $self->{texture}; 1605 delete $self->{texture};
1389 1606
1390 $self->update; 1607 $self->realloc;
1391 $self->check_size;
1392} 1608}
1393 1609
1394sub _draw { 1610sub _draw {
1395 my ($self) = @_; 1611 my ($self) = @_;
1612
1613 $self->SUPER::_draw; # draw background, if applicable
1396 1614
1397 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1398 $self->{layout}->set_foreground (@{$self->{fg}}); 1616 $self->{layout}->set_foreground (@{$self->{fg}});
1399 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1400 $self->{layout}->set_width ($self->{w}); 1618 $self->{layout}->set_width ($self->{w});
1619 $self->{layout}->set_ellipsise ($self->{ellipsise});
1620 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1401 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1402 1622
1403 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1404 1625
1626 unless (exists $self->{ox}) {
1405 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1406 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1407 : ($self->{w} - $tex->{w}) * 0.5; 1629 : ($self->{w} - $tex->{w}) * 0.5);
1408 1630
1409 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1410 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1411 : ($self->{h} - $tex->{h}) * 0.5; 1633 : ($self->{h} - $tex->{h}) * 0.5);
1412
1413 $tex
1414 }; 1634 };
1415 1635
1416 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1418 1638
… …
1444 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1445 can_hover => 1, 1665 can_hover => 1,
1446 can_focus => 1, 1666 can_focus => 1,
1447 valign => 0, 1667 valign => 0,
1448 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1449 @_ 1670 @_
1450 ) 1671 )
1451} 1672}
1452 1673
1453sub _set_text { 1674sub _set_text {
… …
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});
1469} 1690}
1470 1691
1471sub set_text { 1692sub set_text {
1472 my ($self, $text) = @_; 1693 my ($self, $text) = @_;
1473 1694
1474 $self->{cursor} = length $text; 1695 $self->{cursor} = length $text;
1475 $self->_set_text ($text); 1696 $self->_set_text ($text);
1476 $self->check_size; 1697
1477 $self->update; 1698 $self->realloc;
1478} 1699}
1479 1700
1480sub get_text { 1701sub get_text {
1481 $_[0]{text} 1702 $_[0]{text}
1482} 1703}
… …
1485 my ($self) = @_; 1706 my ($self) = @_;
1486 1707
1487 my ($w, $h) = $self->SUPER::size_request; 1708 my ($w, $h) = $self->SUPER::size_request;
1488 1709
1489 ($w + 1, $h) # add 1 for cursor 1710 ($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} 1711}
1497 1712
1498sub key_down { 1713sub key_down {
1499 my ($self, $ev) = @_; 1714 my ($self, $ev) = @_;
1500 1715
… …
1515 } elsif ($sym == CFClient::SDLK_HOME) { 1730 } elsif ($sym == CFClient::SDLK_HOME) {
1516 $self->{cursor} = 0; 1731 $self->{cursor} = 0;
1517 } elsif ($sym == CFClient::SDLK_END) { 1732 } elsif ($sym == CFClient::SDLK_END) {
1518 $self->{cursor} = length $text; 1733 $self->{cursor} = length $text;
1519 } elsif ($uni == 27) { 1734 } elsif ($uni == 27) {
1520 $self->emit ('escape'); 1735 $self->_emit ('escape');
1521 } elsif ($uni) { 1736 } elsif ($uni) {
1522 substr $text, $self->{cursor}++, 0, chr $uni; 1737 substr $text, $self->{cursor}++, 0, chr $uni;
1738 } else {
1739 return 0;
1523 } 1740 }
1524 1741
1525 $self->_set_text ($text); 1742 $self->_set_text ($text);
1526 $self->update; 1743
1744 $self->realloc;
1745
1746 1
1527} 1747}
1528 1748
1529sub focus_in { 1749sub focus_in {
1530 my ($self) = @_; 1750 my ($self) = @_;
1531 1751
… …
1546 utf8::encode $text; 1766 utf8::encode $text;
1547 $self->{cursor} = length substr $text, 0, $idx; 1767 $self->{cursor} = length substr $text, 0, $idx;
1548 1768
1549 $self->_set_text ($self->{text}); 1769 $self->_set_text ($self->{text});
1550 $self->update; 1770 $self->update;
1771
1772 1
1551} 1773}
1552 1774
1553sub mouse_motion { 1775sub mouse_motion {
1554 my ($self, $ev, $x, $y) = @_; 1776 my ($self, $ev, $x, $y) = @_;
1555# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1777# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1778
1779 0
1556} 1780}
1557 1781
1558sub _draw { 1782sub _draw {
1559 my ($self) = @_; 1783 my ($self) = @_;
1560 1784
… …
1611 if ($sym == 13) { 1835 if ($sym == 13) {
1612 unshift @{$self->{history}}, 1836 unshift @{$self->{history}},
1613 my $txt = $self->get_text; 1837 my $txt = $self->get_text;
1614 $self->{history_pointer} = -1; 1838 $self->{history_pointer} = -1;
1615 $self->{history_saveback} = ''; 1839 $self->{history_saveback} = '';
1616 $self->emit (activate => $txt); 1840 $self->_emit (activate => $txt);
1617 $self->update; 1841 $self->update;
1618 1842
1619 } elsif ($sym == CFClient::SDLK_UP) { 1843 } elsif ($sym == CFClient::SDLK_UP) {
1620 if ($self->{history_pointer} < 0) { 1844 if ($self->{history_pointer} < 0) {
1621 $self->{history_saveback} = $self->get_text; 1845 $self->{history_saveback} = $self->get_text;
… …
1637 } else { 1861 } else {
1638 $self->set_text ($self->{history_saveback}); 1862 $self->set_text ($self->{history_saveback});
1639 } 1863 }
1640 1864
1641 } else { 1865 } else {
1642 $self->SUPER::key_down ($ev); 1866 return $self->SUPER::key_down ($ev)
1867 }
1868
1643 } 1869 1
1644
1645} 1870}
1646 1871
1647############################################################################# 1872#############################################################################
1648 1873
1649package CFClient::UI::Button; 1874package CFClient::UI::Button;
… …
1658 1883
1659sub new { 1884sub new {
1660 my $class = shift; 1885 my $class = shift;
1661 1886
1662 $class->SUPER::new ( 1887 $class->SUPER::new (
1663 padding => 4, 1888 padding_x => 4,
1889 padding_y => 4,
1664 fg => [1, 1, 1], 1890 fg => [1, 1, 1],
1665 bg => [1, 1, 1, 0.2],
1666 active_fg => [0, 0, 1], 1891 active_fg => [0, 0, 1],
1667 can_hover => 1, 1892 can_hover => 1,
1668 align => 0, 1893 align => 0,
1669 valign => 0, 1894 valign => 0,
1670 can_events => 1, 1895 can_events => 1,
1671 @_ 1896 @_
1672 ) 1897 )
1673} 1898}
1674 1899
1900sub activate { }
1901
1675sub button_up { 1902sub button_up {
1676 my ($self, $ev, $x, $y) = @_; 1903 my ($self, $ev, $x, $y) = @_;
1677 1904
1905 $self->emit ("activate")
1678 if ($x >= 0 && $x < $self->{w} 1906 if $x >= 0 && $x < $self->{w}
1679 && $y >= 0 && $y < $self->{h}) { 1907 && $y >= 0 && $y < $self->{h};
1680 $self->emit ("activate"); 1908
1681 } 1909 1
1682} 1910}
1683 1911
1684sub _draw { 1912sub _draw {
1685 my ($self) = @_; 1913 my ($self) = @_;
1686 1914
… …
1715 1943
1716sub new { 1944sub new {
1717 my $class = shift; 1945 my $class = shift;
1718 1946
1719 $class->SUPER::new ( 1947 $class->SUPER::new (
1720 padding => 2, 1948 padding_x => 2,
1949 padding_y => 2,
1721 fg => [1, 1, 1], 1950 fg => [1, 1, 1],
1722 active_fg => [1, 1, 0], 1951 active_fg => [1, 1, 0],
1952 bg => [0, 0, 0, 0.2],
1953 active_bg => [1, 1, 1, 0.5],
1723 state => 0, 1954 state => 0,
1724 can_hover => 1, 1955 can_hover => 1,
1725 @_ 1956 @_
1726 ) 1957 )
1727} 1958}
1728 1959
1729sub size_request { 1960sub size_request {
1730 my ($self) = @_; 1961 my ($self) = @_;
1731 1962
1732 ($self->{padding} * 2 + 6) x 2 1963 (6) x 2
1733} 1964}
1734 1965
1735sub button_down { 1966sub button_down {
1736 my ($self, $ev, $x, $y) = @_; 1967 my ($self, $ev, $x, $y) = @_;
1737 1968
1738 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1969 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1739 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1970 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1740 $self->{state} = !$self->{state}; 1971 $self->{state} = !$self->{state};
1741 $self->emit (changed => $self->{state}); 1972 $self->_emit (changed => $self->{state});
1973 } else {
1974 return 0
1975 }
1976
1742 } 1977 1
1743} 1978}
1744 1979
1745sub _draw { 1980sub _draw {
1746 my ($self) = @_; 1981 my ($self) = @_;
1747 1982
1748 $self->SUPER::_draw; 1983 $self->SUPER::_draw;
1749 1984
1750 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1985 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1751 1986
1752 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 1987 my ($w, $h) = @$self{qw(w h)};
1988
1989 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1753 1990
1754 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1991 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1755 1992
1756 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1993 my $tex = $self->{state} ? $tex[1] : $tex[0];
1757 1994
… …
2011 qw(s1_slider.png s1_slider_bg.png); 2248 qw(s1_slider.png s1_slider_bg.png);
2012 2249
2013sub new { 2250sub new {
2014 my $class = shift; 2251 my $class = shift;
2015 2252
2016 # range [value, low, high, page] 2253 # range [value, low, high, page, unit]
2017 2254
2018 # TODO: 0-width page 2255 # TODO: 0-width page
2019 # TODO: req_w/h are wrong with vertical 2256 # TODO: req_w/h are wrong with vertical
2020 # TODO: calculations are off 2257 # TODO: calculations are off
2021 my $self = $class->SUPER::new ( 2258 my $self = $class->SUPER::new (
2022 fg => [1, 1, 1], 2259 fg => [1, 1, 1],
2023 active_fg => [0, 0, 0], 2260 active_fg => [0, 0, 0],
2261 bg => [0, 0, 0, 0.2],
2262 active_bg => [1, 1, 1, 0.5],
2024 range => [0, 0, 100, 10], 2263 range => [0, 0, 100, 10, 0],
2025 req_w => $::WIDTH / 80, 2264 min_w => $::WIDTH / 80,
2026 req_h => $::WIDTH / 80, 2265 min_h => $::WIDTH / 80,
2027 vertical => 0, 2266 vertical => 0,
2028 can_hover => 1, 2267 can_hover => 1,
2029 inner_pad => 5, 2268 inner_pad => 0.02,
2030 @_ 2269 @_
2031 ); 2270 );
2032 2271
2272 $self->set_value ($self->{range}[0]);
2273 $self->update;
2274
2033 $self 2275 $self
2034} 2276}
2035 2277
2278sub changed { }
2279
2280sub set_range {
2281 my ($self, $range) = @_;
2282
2283 ($range, $self->{range}) = ($self->{range}, $range);
2284
2285 $self->update
2286 if "@$range" ne "@{$self->{range}}";
2287}
2288
2289sub set_value {
2290 my ($self, $value) = @_;
2291
2292 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2293
2294 $hi = $lo + 1 if $hi <= $lo;
2295
2296 $page = $hi - $lo if $page > $hi - $lo;
2297
2298 $value = $lo if $value < $lo;
2299 $value = $hi - $page if $value > $hi - $page;
2300
2301 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2302 if $unit;
2303
2304 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2305
2306 if ($value != $old_value) {
2307 $self->_emit (changed => $value);
2308 $self->update;
2309 }
2310}
2311
2036sub size_request { 2312sub size_request {
2037 my ($self) = @_; 2313 my ($self) = @_;
2038 2314
2039 my $w = $self->{req_w}; 2315 ($self->{req_w}, $self->{req_h})
2040 my $h = $self->{req_h};
2041
2042 $self->{vertical} ? ($h, $w) : ($w, $h)
2043} 2316}
2044 2317
2045sub button_down { 2318sub button_down {
2046 my ($self, $ev, $x, $y) = @_; 2319 my ($self, $ev, $x, $y) = @_;
2047 2320
2048 $self->SUPER::button_down ($ev, $x, $y); 2321 $self->SUPER::button_down ($ev, $x, $y);
2322
2323 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2324
2049 $self->mouse_motion ($ev, $x, $y); 2325 $self->mouse_motion ($ev, $x, $y)
2050} 2326}
2051 2327
2052sub mouse_motion { 2328sub mouse_motion {
2053 my ($self, $ev, $x, $y) = @_; 2329 my ($self, $ev, $x, $y) = @_;
2054 2330
2055 if ($GRAB == $self) { 2331 if ($GRAB == $self) {
2332 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2333
2334 my (undef, $lo, $hi, $page) = @{$self->{range}};
2335
2336 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2337
2338 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2339 } else {
2340 return 0;
2341 }
2342
2343 1
2344}
2345
2346sub update {
2347 my ($self) = @_;
2348
2349 $CFClient::UI::ROOT->on_post_alloc ($self => sub {
2350 $self->set_value ($self->{range}[0]);
2351
2056 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2352 my ($value, $lo, $hi, $page) = @{$self->{range}};
2353 my $range = ($hi - $page - $lo) || 1e-100;
2057 2354
2058 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2355 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2059 2356
2060 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2357 $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 2358 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2062 2359
2063 $x -= $inner_pad_px; # substract the padding 2360 $value = ($value - $lo) / $range;
2064 $x = $x * ($hi - $lo) / $inner_w + $lo; 2361 $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 2362
2069 $self->emit (changed => $x); 2363 $self->{knob_x} = $value - $knob_w * 0.5;
2070 $self->update; 2364 $self->{knob_w} = $knob_w;
2071 } 2365 });
2072}
2073 2366
2074# the inner_* stuff is for generating a padding for the slider handle, 2367 $self->SUPER::update;
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} 2368}
2081 2369
2082sub _draw { 2370sub _draw {
2083 my ($self) = @_; 2371 my ($self) = @_;
2084 2372
2085 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2086 2374
2087 my ($w, $h) = @$self{qw(w h)}; 2375 glScale $self->{w}, $self->{h};
2088 2376
2089 if ($self->{vertical}) { 2377 if ($self->{vertical}) {
2090 # draw a vertical slider like a rotated horizontal slider 2378 # draw a vertical slider like a rotated horizontal slider
2091 2379
2380 glTranslate 1, 0, 0;
2092 glRotate 90, 0, 0, 1; 2381 glRotate 90, 0, 0, 1;
2093 glTranslate 0, -$self->{w}, 0;
2094
2095 ($w, $h) = ($h, $w);
2096 } 2382 }
2097 2383
2098 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2384 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2099 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2385 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2100 2386
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; 2387 glEnable GL_TEXTURE_2D;
2120 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2121 2389
2122 # draw background 2390 # draw background
2123 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2391 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2124 2392
2125 # draw handle 2393 # draw handle
2126 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2394 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2127 2395
2128 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2129} 2397}
2398
2399#############################################################################
2400
2401package CFClient::UI::ValSlider;
2402
2403our @ISA = CFClient::UI::HBox::;
2404
2405sub new {
2406 my ($class, %arg) = @_;
2407
2408 my $range = delete $arg{range};
2409
2410 my $self = $class->SUPER::new (
2411 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2412 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2413 to_value => sub { shift },
2414 from_value => sub { shift },
2415 %arg,
2416 );
2417
2418 $self->{slider}->connect (changed => sub {
2419 my ($self, $value) = @_;
2420 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2421 $self->{parent}->emit (changed => $value);
2422 });
2423
2424# $self->{entry}->connect (changed => sub {
2425# my ($self, $value) = @_;
2426# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2427# $self->{parent}->emit (changed => $value);
2428# });
2429
2430 $self->add ($self->{slider}, $self->{entry});
2431
2432 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2433
2434 $self
2435}
2436
2437sub set_range { shift->{slider}->set_range (@_) }
2438sub set_value { shift->{slider}->set_value (@_) }
2130 2439
2131############################################################################# 2440#############################################################################
2132 2441
2133package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2134 2443
… …
2164 2473
2165 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2166 $self->reflow; 2475 $self->reflow;
2167} 2476}
2168 2477
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 { 2478sub size_allocate {
2189 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2190 2480
2191 $self->SUPER::size_allocate ($w, $h); 2481 $self->SUPER::size_allocate ($w, $h);
2192 2482
… …
2195 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2196 2486
2197 $self->reflow; 2487 $self->reflow;
2198} 2488}
2199 2489
2490sub text_size {
2491 my ($self, $text, $indent) = @_;
2492
2493 my $layout = $self->{layout};
2494
2495 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2496 $layout->set_width ($self->{children}[0]{w} - $indent);
2497 $layout->set_markup ($text);
2498
2499 $layout->size
2500}
2501
2502sub reflow {
2503 my ($self) = @_;
2504
2505 $self->{need_reflow}++;
2506 $self->update;
2507}
2508
2509sub set_offset {
2510 my ($self, $offset) = @_;
2511
2512 # todo: base offset on lines or so, not on pixels
2513 $self->{children}[1]->set_value ($offset);
2514}
2515
2516sub clear {
2517 my ($self) = @_;
2518
2519 $self->{par} = [];
2520 $self->{height} = 0;
2521 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2522}
2523
2200sub add_paragraph { 2524sub add_paragraph {
2201 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2202 2526
2203 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2204 2528 my ($w, $h) = $self->text_size ($line);
2205 my $height = $self->text_height ($text);
2206
2207 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2208 2532
2209 push @{$self->{par}}, [$height, $color, $text];
2210
2211 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2533 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]);
2212 $self->{children}[1]->update;
2213} 2534}
2214 2535
2215sub update { 2536sub update {
2216 my ($self) = @_; 2537 my ($self) = @_;
2217 2538
… …
2220 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2221 2542
2222 delete $self->{texture}; 2543 delete $self->{texture};
2223 2544
2224 $ROOT->on_post_alloc ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2225 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2226 my $height = 0; 2549 my $height = 0;
2227 2550
2228 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2229 for @{$self->{par}}; 2555 for (@{$self->{par}}) {
2556 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2557 $layout->set_width ($W - $_->[3]);
2558 $layout->set_markup ($_->[4]);
2559 my ($w, $h) = $layout->size;
2560 $_->[0] = $w + $_->[3];
2561 $_->[1] = $h;
2562 }
2563
2564 $height += $_->[1];
2565 }
2230 2566
2231 $self->{height} = $height; 2567 $self->{height} = $height;
2232 2568
2233 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2234 2570
2235 delete $self->{texture}; 2571 delete $self->{texture};
2236 } 2572 }
2237 2573
2238 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2574 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2239 glClearColor 0, 0, 0, 0; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2240 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2241 2577
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]; 2578 my $top = int $self->{children}[1]{range}[0];
2246 2579
2247 my $y0 = $top; 2580 my $y0 = $top;
2248 my $y1 = $top + $self->{h}; 2581 my $y1 = $top + $H;
2249 2582
2250 my $y = 0; 2583 my $y = 0;
2251 2584
2252 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2253 2586
2254 $layout->set_font ($self->{font}) if $self->{font}; 2587 $layout->set_font ($self->{font}) if $self->{font};
2255 2588
2589 glEnable GL_BLEND;
2590 #TODO# not correct in windows where rgba is forced off
2591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2592
2256 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2257 my $h = $par->[0]; 2594 my $h = $par->[1];
2258 2595
2259 if ($y0 < $y + $h && $y < $y1) { 2596 if ($y0 < $y + $h && $y < $y1) {
2260 $layout->set_foreground (@{ $par->[1] }); 2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2261 $layout->set_markup ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2262 2600
2263 my ($W, $H) = $layout->size; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2264 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2602
2603 glRasterPos $par->[3], $y - $y0;
2604 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2265 } 2605 }
2266 2606
2267 $y += $h; 2607 $y += $h;
2268 } 2608 }
2269 2609
2270 glDisable GL_TEXTURE_2D; 2610 glDisable GL_BLEND;
2271 }; 2611 };
2272 }); 2612 });
2273} 2613}
2274 2614
2275sub _draw { 2615sub _draw {
2276 my ($self) = @_; 2616 my ($self) = @_;
2277 2617
2278 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2279 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2280 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2281 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2621 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2282 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2283 2623
2284 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2285 2625
2286} 2626}
… …
2335 2675
2336sub new { 2676sub new {
2337 my $class = shift; 2677 my $class = shift;
2338 2678
2339 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2340 state => 0, 2680 state => 0,
2341 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2342 @_ 2682 @_
2343 ); 2683 );
2344 2684
2345 if ($self->{state}) {
2346 $self->{state} = 0;
2347 $self->toggle_flopper;
2348 }
2349
2350 $self 2685 $self
2351} 2686}
2352 2687
2353sub toggle_flopper { 2688sub toggle_flopper {
2354 my ($self) = @_; 2689 my ($self) = @_;
2355 2690
2356 # TODO: use animation 2691 $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} 2692}
2368 2693
2369############################################################################# 2694#############################################################################
2370 2695
2371package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2384} 2709}
2385 2710
2386sub set_tooltip_from { 2711sub set_tooltip_from {
2387 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2388 2713
2714 my $tooltip = $widget->{tooltip};
2715
2716 if ($ENV{CFPLUS_DEBUG} & 2) {
2717 $tooltip .= "\n\n" . (ref $widget) . "\n"
2718 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2719 . "req $widget->{req_w} $widget->{req_h}\n"
2720 . "visible $widget->{visible}";
2721 }
2722
2389 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2390 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2391 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2392 fontsize => 0.8, 2726 fontsize => 0.8,
2393 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2728 ellipsise => 0,
2394 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
2395 ); 2730 );
2396} 2731}
2397 2732
2398sub size_request { 2733sub size_request {
2399 my ($self) = @_; 2734 my ($self) = @_;
… …
2405 2740
2406sub size_allocate { 2741sub size_allocate {
2407 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2408 2743
2409 $self->SUPER::size_allocate ($w - 4, $h - 4); 2744 $self->SUPER::size_allocate ($w - 4, $h - 4);
2745}
2746
2747sub visibility_change {
2748 my ($self, $visible) = @_;
2749
2750 return unless $visible;
2751
2752 $self->{root}->on_post_alloc ("move_$self" => sub {
2753 my $widget = $self->{owner}
2754 or return;
2755
2756 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2757
2758 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2759 if $x + $self->{w} > $::WIDTH;
2760
2761 $self->move_abs ($x, $y);
2762 });
2410} 2763}
2411 2764
2412sub _draw { 2765sub _draw {
2413 my ($self) = @_; 2766 my ($self) = @_;
2414 2767
… …
2431 glVertex $w, $h; 2784 glVertex $w, $h;
2432 glVertex $w, 0; 2785 glVertex $w, 0;
2433 glEnd; 2786 glEnd;
2434 2787
2435 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2436 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2437} 2791}
2438 2792
2439############################################################################# 2793#############################################################################
2440 2794
… …
2445use CFClient::OpenGL; 2799use CFClient::OpenGL;
2446 2800
2447sub new { 2801sub new {
2448 my $class = shift; 2802 my $class = shift;
2449 2803
2450 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2451 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2452 @_, 2807 @_,
2453 ) 2808 );
2809
2810 if ($self->{anim} && $self->{animspeed}) {
2811 Scalar::Util::weaken (my $widget = $self);
2812
2813 $self->{timer} = Event->timer (
2814 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2815 hard => 1,
2816 interval => $self->{animspeed},
2817 cb => sub {
2818 ++$widget->{frame};
2819 $widget->update;
2820 },
2821 );
2822 }
2823
2824 $self
2454} 2825}
2455 2826
2456sub size_request { 2827sub size_request {
2457 (32, 8) 2828 (32, 8)
2458} 2829}
2459 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2460sub _draw { 2839sub _draw {
2461 my ($self) = @_; 2840 my ($self) = @_;
2462 2841
2463 return unless $::CONN;#d# manage and cache textures differently 2842 return unless $::CONN;
2843
2844 my $face;
2845
2846 if ($self->{frame}) {
2847 my $anim = $::CONN->{anim}[$self->{anim}];
2848
2849 $face = $anim->[ $self->{frame} % @$anim ]
2850 if $anim && @$anim;
2851 }
2852
2464 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2465 2854
2466 # TODO animation
2467 if ($tex) { 2855 if ($tex) {
2468 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2469 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2470 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2471 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2472 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2473 } 2861 }
2474} 2862}
2475 2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2871}
2872
2476############################################################################# 2873#############################################################################
2477 2874
2478package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2479 2876
2480our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2481 2878
2482sub new { 2879# 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 2880
2590############################################################################# 2881#############################################################################
2591 2882
2592package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2593 2884
… …
2627 2918
2628# popup given the event (must be a mouse button down event currently) 2919# popup given the event (must be a mouse button down event currently)
2629sub popup { 2920sub popup {
2630 my ($self, $ev) = @_; 2921 my ($self, $ev) = @_;
2631 2922
2632 $self->emit ("popdown"); 2923 $self->_emit ("popdown");
2633 2924
2634 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2635 $GRAB = $self; 2926 $GRAB = $self;
2636 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2637 2928
2638 $self->show; 2929 $self->show;
2639 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 2930 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2640} 2931}
2641 2932
2642sub mouse_motion { 2933sub mouse_motion {
2643 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2644 2935
2645 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2646 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2647 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2648} 2941}
2649 2942
2650sub button_up { 2943sub button_up {
2651 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2652 2945
2653 if ($ev->{button} == $self->{button}) { 2946 if ($ev->{button} == $self->{button}) {
2654 undef $GRAB; 2947 undef $GRAB;
2655 $self->hide; 2948 $self->hide;
2656 2949
2657 $self->emit ("popdown"); 2950 $self->_emit ("popdown");
2658 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2659 } 2956 1
2660} 2957}
2661 2958
2662############################################################################# 2959#############################################################################
2663 2960
2961package CFClient::UI::Multiplexer;
2962
2963our @ISA = CFClient::UI::Container::;
2964
2965sub new {
2966 my $class = shift;
2967
2968 my $self = $class->SUPER::new (
2969 @_,
2970 );
2971
2972 $self->{current} = $self->{children}[0]
2973 if @{ $self->{children} };
2974
2975 $self
2976}
2977
2978sub add {
2979 my ($self, @widgets) = @_;
2980
2981 $self->SUPER::add (@widgets);
2982
2983 $self->{current} = $self->{children}[0]
2984 if @{ $self->{children} };
2985}
2986
2987sub set_current_page {
2988 my ($self, $page_or_widget) = @_;
2989
2990 my $widget = ref $page_or_widget
2991 ? $page_or_widget
2992 : $self->{children}[$page_or_widget];
2993
2994 $self->{current} = $widget;
2995 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
2996
2997 $self->_emit (page_changed => $self->{current});
2998
2999 $self->realloc;
3000}
3001
3002sub visible_children {
3003 $_[0]{current}
3004}
3005
3006sub size_request {
3007 my ($self) = @_;
3008
3009 $self->{current}->size_request
3010}
3011
3012sub size_allocate {
3013 my ($self, $w, $h) = @_;
3014
3015 $self->{current}->configure (0, 0, $w, $h);
3016}
3017
3018sub _draw {
3019 my ($self) = @_;
3020
3021 $self->{current}->draw;
3022}
3023
3024#############################################################################
3025
3026package CFClient::UI::Notebook;
3027
3028our @ISA = CFClient::UI::VBox::;
3029
3030sub new {
3031 my $class = shift;
3032
3033 my $self = $class->SUPER::new (
3034 buttonbar => (new CFClient::UI::Buttonbar),
3035 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3036 # filter => # will be put between multiplexer and $self
3037 @_,
3038 );
3039
3040 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3041 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3042
3043 $self
3044}
3045
3046sub add {
3047 my ($self, $title, $widget, $tooltip) = @_;
3048
3049 Scalar::Util::weaken $self;
3050
3051 $self->{buttonbar}->add (new CFClient::UI::Button
3052 markup => $title,
3053 tooltip => $tooltip,
3054 on_activate => sub { $self->set_current_page ($widget) },
3055 );
3056
3057 $self->{multiplexer}->add ($widget);
3058}
3059
3060sub set_current_page {
3061 my ($self, $page) = @_;
3062
3063 $self->{multiplexer}->set_current_page ($page);
3064 $self->_emit (page_changed => $self->{multiplexer}{current});
3065}
3066
3067#############################################################################
3068
2664package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
2665 3070
2666our @ISA = CFClient::UI::VBox::; 3071our @ISA = CFClient::UI::VBox::;
3072
3073sub new {
3074 my $class = shift;
3075
3076 $class->SUPER::new (
3077 fontsize => 0.8,
3078 @_,
3079 )
3080}
2667 3081
2668sub reorder { 3082sub reorder {
2669 my ($self) = @_; 3083 my ($self) = @_;
2670 my $NOW = time; 3084 my $NOW = time;
2671 3085
… …
2690 ? "<b>$item->{count} ×</b> $item->{text}" 3104 ? "<b>$item->{count} ×</b> $item->{text}"
2691 : $item->{text}; 3105 : $item->{text};
2692 3106
2693 for ($short) { 3107 for ($short) {
2694 s/^\s+//; 3108 s/^\s+//;
2695 s/\012.*/…/s; 3109 s/\s+/ /g;
2696 my $len = int 40 / $item->{fontsize};
2697 substr $_, $len, length, "…" if $len < length;
2698 } 3110 }
2699 3111
2700 new CFClient::UI::Label 3112 new CFClient::UI::Label
2701 markup => $short, 3113 markup => $short,
2702 tooltip => $item->{tooltip}, 3114 tooltip => $item->{tooltip},
2703 tooltip_font => $::FONT_PROP, 3115 tooltip_font => $::FONT_PROP,
2704 tooltip_width => 0.67, 3116 tooltip_width => 0.67,
2705 fontsize => $item->{fontsize}, 3117 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44,
2706 color => $item->{color}, 3119 fg => $item->{fg},
2707 can_events => 1, 3120 can_events => 1,
2708 can_hover => 1 3121 can_hover => 1
2709 }; 3122 };
2710 } 3123 }
2711 3124
… …
2716sub add { 3129sub add {
2717 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
2718 3131
2719 $text =~ s/^\s+//; 3132 $text =~ s/^\s+//;
2720 $text =~ s/\s+$//; 3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
2721 3136
2722 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
2723 3138
2724 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2725 3140
… …
2737 $self->{item}{$group} = { 3152 $self->{item}{$group} = {
2738 id => ++$self->{id}, 3153 id => ++$self->{id},
2739 text => $text, 3154 text => $text,
2740 timeout => $timeout, 3155 timeout => $timeout,
2741 tooltip => $text, 3156 tooltip => $text,
2742 fontsize => 0.8,
2743 color => [0.8, 0.8, 0.8, 0.8], 3157 fg => [0.8, 0.8, 0.8, 0.8],
2744 pri => 0, 3158 pri => 0,
2745 count => 1, 3159 count => 1,
2746 %arg, 3160 %arg,
2747 }; 3161 };
2748 } 3162 }
2749 3163
2750 $self->reorder; 3164 $self->reorder;
2751} 3165}
2752 3166
3167sub reconfigure {
3168 my ($self) = @_;
3169
3170 delete $_->{label}
3171 for values %{ $self->{item} || {} };
3172
3173 $self->reorder;
3174 $self->SUPER::reconfigure;
3175}
3176
2753############################################################################# 3177#############################################################################
2754 3178
2755package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
2756 3180
2757our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
2758
2759use CFClient::OpenGL;
2760 3182
2761sub new { 3183sub new {
2762 my $class = shift; 3184 my $class = shift;
2763 3185
2764 $class->SUPER::new ( 3186 my $self = $class->SUPER::new (
3187 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3188 @_,
3189 );
3190
3191 $self
3192}
3193
3194sub set_items {
3195 my ($self, $items) = @_;
3196
3197 $self->{child}->clear;
3198 return unless $items;
3199
3200 my @items = sort {
3201 ($a->{type} <=> $b->{type})
3202 or ($a->{name} cmp $b->{name})
3203 } @$items;
3204
3205 $self->{real_items} = \@items;
3206
3207 my $row = 0;
3208 for my $item (@items) {
3209 CFClient::Item::update_widgets $item;
3210
3211 $self->{child}->add (0, $row, $item->{face_widget});
3212 $self->{child}->add (1, $row, $item->{desc_widget});
3213 $self->{child}->add (2, $row, $item->{weight_widget});
3214
3215 $row++;
3216 }
3217}
3218
3219#############################################################################
3220
3221package CFClient::UI::BindEditor;
3222
3223our @ISA = CFClient::UI::FancyFrame::;
3224
3225sub new {
3226 my $class = shift;
3227
3228 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3229
3230 $self->add (my $vb = new CFClient::UI::VBox);
3231
3232
3233 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3234 text => "start recording",
3235 tooltip => "Start/Stops recording of actions."
3236 ."All subsequent actions after the recording started will be captured."
3237 ."The actions are displayed after the record was stopped."
3238 ."To bind the action you have to click on the 'Bind' button",
3239 on_activate => sub {
3240 unless ($self->{recording}) {
3241 $self->start;
3242 } else {
3243 $self->stop;
3244 }
3245 });
3246
3247 $vb->add (new CFClient::UI::Label text => "Actions:");
3248 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3249
3250 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3251 $vb->add (my $hb = new CFClient::UI::HBox);
3252 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3253 $hb->add (new CFClient::UI::Button
3254 text => "bind",
3255 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3256 on_activate => sub {
3257 $self->ask_for_bind;
3258 });
3259
3260 $vb->add (my $hb = new CFClient::UI::HBox);
3261 $hb->add (new CFClient::UI::Button
3262 text => "ok",
3263 expand => 1,
3264 tooltip => "This closes the binding editor and saves the binding",
3265 on_activate => sub {
3266 $self->hide;
3267 $self->commit;
3268 });
3269
3270 $hb->add (new CFClient::UI::Button
3271 text => "cancel",
3272 expand => 1,
3273 tooltip => "This closes the binding editor without saving",
3274 on_activate => sub {
3275 $self->hide;
3276 $self->{binding_cancel}->()
3277 if $self->{binding_cancel};
3278 });
3279
3280 $self->update_binding_widgets;
3281
3282 $self
3283}
3284
3285sub commit {
3286 my ($self) = @_;
3287 my ($mod, $sym, $cmds) = $self->get_binding;
3288 if ($sym != 0 && @$cmds > 0) {
3289 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3290 ."'. Don't forget 'Save Config'!");
3291 $self->{binding_change}->($mod, $sym, $cmds)
3292 if $self->{binding_change};
3293 } else {
3294 $::STATUSBOX->add ("No action bound, no key or action specified!");
3295 $self->{binding_cancel}->()
3296 if $self->{binding_cancel};
3297 }
3298}
3299
3300sub start {
3301 my ($self) = @_;
3302
3303 $self->{rec_btn}->set_text ("stop recording");
3304 $self->{recording} = 1;
3305 $self->clear_command_list;
3306 $::CONN->start_record if $::CONN;
3307}
3308
3309sub stop {
3310 my ($self) = @_;
3311
3312 $self->{rec_btn}->set_text ("start recording");
3313 $self->{recording} = 0;
3314
3315 my $rec;
3316 $rec = $::CONN->stop_record if $::CONN;
3317 return unless ref $rec eq 'ARRAY';
3318 $self->set_command_list ($rec);
3319}
3320
3321
3322sub ask_for_bind_and_commit {
3323 my ($self) = @_;
3324 $self->ask_for_bind (1);
3325}
3326
3327sub ask_for_bind {
3328 my ($self, $commit) = @_;
3329
3330 CFClient::Binder::open_binding_dialog (sub {
3331 my ($mod, $sym) = @_;
3332 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3333 $self->update_binding_widgets;
3334 $self->commit if $commit;
3335 });
3336}
3337
3338# $mod and $sym are the modifiers and key symbol
3339# $cmds is a array ref of strings (the commands)
3340# $cb is the callback that is executed on OK
3341# $ccb is the callback that is executed on CANCEL and
3342# when the binding was unsuccessful on OK
3343sub set_binding {
3344 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3345
3346 $self->clear_command_list;
3347 $self->{recording} = 0;
3348 $self->{rec_btn}->set_text ("start recording");
3349
3350 $self->{binding} = [$mod, $sym];
3351 $self->{commands} = $cmds;
3352
3353 $self->{binding_change} = $cb;
3354 $self->{binding_cancel} = $ccb;
3355
3356 $self->update_binding_widgets;
3357}
3358
3359# this is a shortcut method that asks for a binding
3360# and then just binds it.
3361sub do_quick_binding {
3362 my ($self, $cmds) = @_;
3363 $self->set_binding (undef, undef, $cmds, sub {
3364 $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
3365 });
3366 $self->ask_for_bind (1);
3367}
3368
3369sub update_binding_widgets {
3370 my ($self) = @_;
3371 my ($mod, $sym, $cmds) = $self->get_binding;
3372 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3373 $self->set_command_list ($cmds);
3374}
3375
3376sub get_binding {
3377 my ($self) = @_;
3378 return (
3379 $self->{binding}->[0],
3380 $self->{binding}->[1],
3381 [ grep { defined $_ } @{$self->{commands}} ]
3382 );
3383}
3384
3385sub clear_command_list {
3386 my ($self) = @_;
3387 $self->{cmdbox}->clear ();
3388}
3389
3390sub set_command_list {
3391 my ($self, $cmds) = @_;
3392
3393 $self->{cmdbox}->clear ();
3394 $self->{commands} = $cmds;
3395
3396 my $idx = 0;
3397
3398 for (@$cmds) {
3399 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3400
3401 my $i = $idx;
3402 $hb->add (new CFClient::UI::Label text => $_);
3403 $hb->add (new CFClient::UI::Button
3404 text => "delete",
3405 tooltip => "Deletes the action from the record",
3406 on_activate => sub {
3407 $self->{cmdbox}->remove ($hb);
3408 $cmds->[$i] = undef;
3409 });
3410
3411
3412 $idx++
3413 }
3414}
3415
3416#############################################################################
3417
3418package CFClient::UI::SpellList;
3419
3420our @ISA = CFClient::UI::Table::;
3421
3422sub new {
3423 my $class = shift;
3424
3425 my $self = $class->SUPER::new (
3426 binding => [],
3427 commands => [],
2765 @_, 3428 @_,
2766 ) 3429 )
2767} 3430}
2768 3431
2769sub configure { 3432# XXX: Do sorting? Argl...
2770 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
2771
2772 $self->{w} = $w;
2773 $self->{h} = $h;
2774}
2775
2776sub check_size {
2777 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
2778 3436
2779 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2780 if $self->{w}; 3438 face => $spell->{face},
3439 can_hover => 1,
3440 can_events => 1,
3441 tooltip => $spell->{message});
3442
3443 $self->add (1, $self->{tbl_idx}, new CFClient::UI::Label
3444 text => $spell->{name},
3445 can_hover => 1,
3446 can_events => 1,
3447 tooltip => $spell->{message},
3448 expand => 1);
3449
3450 $self->add (2, $self->{tbl_idx}, new CFClient::UI::Label
3451 text => (sprintf "lvl: %2d sp: %2d dmg: %2d",
3452 $spell->{level}, ($spell->{mana} || $spell->{grace}), $spell->{damage}),
3453 expand => 1);
3454
3455 $self->add (3, $self->{tbl_idx}++, new CFClient::UI::Button
3456 text => "bind to key",
3457 on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) });
3458}
3459
3460sub rebuild_spell_list {
3461 my ($self) = @_;
3462 $self->{tbl_idx} = 0;
3463 $self->add_spell ($_) for values %{$self->{spells}};
3464}
3465
3466sub remove_spell {
3467 my ($self, $spell) = @_;
3468 delete $self->{spells}->{$spell->{name}};
3469 $self->rebuild_spell_list;
3470}
3471
3472#############################################################################
3473
3474package CFClient::UI::Root;
3475
3476our @ISA = CFClient::UI::Container::;
3477
3478use CFClient::OpenGL;
3479
3480sub new {
3481 my $class = shift;
3482
3483 my $self = $class->SUPER::new (
3484 visible => 1,
3485 @_,
3486 );
3487
3488 Scalar::Util::weaken ($self->{root} = $self);
3489
3490 $self
2781} 3491}
2782 3492
2783sub size_request { 3493sub size_request {
2784 my ($self) = @_; 3494 my ($self) = @_;
2785 3495
2786 ($self->{w}, $self->{h}) 3496 ($self->{w}, $self->{h})
3497}
3498
3499sub _to_pixel {
3500 my ($coord, $size, $max) = @_;
3501
3502 $coord =
3503 $coord eq "center" ? ($max - $size) * 0.5
3504 : $coord eq "max" ? $max
3505 : $coord;
3506
3507 $coord = 0 if $coord < 0;
3508 $coord = $max - $size if $coord > $max - $size;
3509
3510 int $coord + 0.5
2787} 3511}
2788 3512
2789sub size_allocate { 3513sub size_allocate {
2790 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2791 3515
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) { 3516 for my $child ($self->children) {
2799 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3517 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2800 3518
2801 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3519 $X = $child->{force_x} if exists $child->{force_x};
2802 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3520 $Y = $child->{force_y} if exists $child->{force_y};
3521
3522 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h};
3524
2803 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
2804 } 3526 }
2805} 3527}
2806 3528
2807sub coord2local { 3529sub coord2local {
… …
2817} 3539}
2818 3540
2819sub update { 3541sub update {
2820 my ($self) = @_; 3542 my ($self) = @_;
2821 3543
2822 $self->check_size;
2823 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
2824} 3545}
2825 3546
2826sub add { 3547sub add {
2827 my ($self, @children) = @_; 3548 my ($self, @children) = @_;
2828 3549
2829 for my $child (@children) {
2830 $child->{toplevel} = 1; 3550 $_->{is_toplevel} = 1
2831 3551 for @children;
2832 # integerise window positions
2833 $child->{x} = int $child->{x};
2834 $child->{y} = int $child->{y};
2835 }
2836 3552
2837 $self->SUPER::add (@children); 3553 $self->SUPER::add (@children);
3554}
3555
3556sub remove {
3557 my ($self, @children) = @_;
3558
3559 $self->SUPER::remove (@children);
3560
3561 delete $self->{is_toplevel}
3562 for @children;
3563
3564 while (@children) {
3565 my $w = pop @children;
3566 push @children, $w->children;
3567 $w->set_invisible;
3568 }
2838} 3569}
2839 3570
2840sub on_refresh { 3571sub on_refresh {
2841 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2842 3573
… …
2855 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2856 $_->() 3587 $_->()
2857 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
2858 } 3589 }
2859 3590
2860 if ($self->{check_size}) { 3591 if ($self->{realloc}) {
2861 my @queue = ([], []); 3592 my %queue;
3593 my @queue;
3594 my $widget;
2862 3595
2863 for (;;) { 3596 outer:
2864 if ($self->{check_size}) { 3597 while () {
2865 # heuristic: check containers last 3598 if (my $realloc = delete $self->{realloc}) {
2866 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3599 for $widget (values %$realloc) {
2867 for values %{delete $self->{check_size}} 3600 $widget->{visible} or next; # do not resize invisible widgets
3601
3602 $queue{$widget+0}++ and next; # duplicates are common
3603
3604 push @{ $queue[$widget->{visible}] }, $widget;
3605 }
2868 } 3606 }
2869 3607
2870 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3608 while () {
3609 @queue or last outer;
2871 3610
2872 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3611 $widget = pop @{ $queue[-1] || [] }
2873 ? @$widget{qw(user_w user_h)} 3612 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 3613
3614 pop @queue;
3615 }
3616
3617 delete $queue{$widget+0};
3618
3619 my ($w, $h) = $widget->size_request;
3620
3621 $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3622 $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3623
3624 $w = $widget->{force_w} if exists $widget->{force_w};
3625 $h = $widget->{force_h} if exists $widget->{force_h};
3626
3627 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3628 || delete $widget->{force_realloc}) {
2880 $widget->{req_w} = $w; 3629 $widget->{req_w} = $w;
2881 $widget->{req_h} = $h; 3630 $widget->{req_h} = $h;
2882 3631
2883 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3632 $self->{size_alloc}{$widget+0} = $widget;
2884 3633
2885 $widget->{parent}->check_size
2886 if $widget->{parent}; 3634 if (my $parent = $widget->{parent}) {
3635 $self->{realloc}{$parent+0} = $parent
3636 unless $queue{$parent+0};
3637
3638 $parent->{force_size_alloc} = 1;
3639 $self->{size_alloc}{$parent+0} = $parent;
3640 }
2887 } 3641 }
3642
3643 delete $self->{realloc}{$widget+0};
2888 } 3644 }
2889 } 3645 }
2890 3646
2891 while ($self->{size_alloc}) { 3647 while (my $size_alloc = delete $self->{size_alloc}) {
2892 for (values %{delete $self->{size_alloc}}) { 3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
2893 my ($widget, $w, $h) = @$_; 3649 values %$size_alloc;
3650
3651 while () {
3652 my $widget = pop @queue || last;
3653
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
2894 3655
2895 $w = 0 if $w < 0; 3656 $w = 0 if $w < 0;
2896 $h = 0 if $h < 0; 3657 $h = 0 if $h < 0;
2897 3658
3659 $w = int $w + 0.5;
3660 $h = int $h + 0.5;
3661
3662 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3663 $widget->{old_w} = $widget->{w};
3664 $widget->{old_h} = $widget->{h};
3665
2898 $widget->{w} = $w; 3666 $widget->{w} = $w;
2899 $widget->{h} = $h; 3667 $widget->{h} = $h;
2900 $widget->size_allocate ($w, $h); 3668
2901 $widget->emit (size_allocate => $w, $h); 3669 $widget->emit (size_allocate => $w, $h);
3670 }
2902 } 3671 }
2903 } 3672 }
2904 3673
2905 while ($self->{post_alloc_hook}) { 3674 while ($self->{post_alloc_hook}) {
2906 $_->() 3675 $_->()
2907 for values %{delete $self->{post_alloc_hook}}; 3676 for values %{delete $self->{post_alloc_hook}};
2908 } 3677 }
2909 3678
3679
2910 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2911 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2912 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
2913 3683
2914 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
2915 glLoadIdentity; 3685 glLoadIdentity;
2916 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2917 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
2918 glLoadIdentity; 3688 glLoadIdentity;
2919 3689
3690 {
3691 package CFClient::UI::Base;
3692
3693 ($draw_x, $draw_y, $draw_w, $draw_h) =
3694 (0, 0, $self->{w}, $self->{h});
3695 }
3696
2920 $self->_draw; 3697 $self->_draw;
2921} 3698}
2922 3699
2923############################################################################# 3700#############################################################################
2924 3701
2925package CFClient::UI; 3702package CFClient::UI;
2926 3703
2927$ROOT = new CFClient::UI::Root; 3704$ROOT = new CFClient::UI::Root;
2928$TOOLTIP = new CFClient::UI::Tooltip; 3705$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2929 3706
29301 37071
2931 3708

Diff Legend

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