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.207 by elmex, Mon May 15 18:23:33 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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