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

Diff Legend

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