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

Diff Legend

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