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.197 by root, Fri May 12 01:47:04 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
19our %WIDGET; # all widgets, weak-referenced
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
17sub check_tooltip { 44sub check_tooltip {
45 return if $ENV{CFPLUS_DEBUG} & 8;
46
18 if (!$GRAB) { 47 if (!$GRAB) {
19 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 48 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
20 if (length $widget->{tooltip}) { 49 if (length $widget->{tooltip}) {
21
22 if ($TOOLTIP->{owner} != $widget) { 50 if ($TOOLTIP->{owner} != $widget) {
51 $TOOLTIP->hide;
52
23 $TOOLTIP->{owner} = $widget; 53 $TOOLTIP->{owner} = $widget;
24 54
25 my $tip = $widget->{tooltip}; 55 my $tip = $widget->{tooltip};
26 56
27 $tip = $tip->($widget) if CODE:: eq ref $tip; 57 $tip = $tip->($widget) if CODE:: eq ref $tip;
28 58
29 $TOOLTIP->set_tooltip_from ($widget); 59 $TOOLTIP->set_tooltip_from ($widget);
30 $TOOLTIP->show; 60 $TOOLTIP->show;
31
32 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
33
34 if ($x + $TOOLTIP->{w} > $::WIDTH) {
35 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
36 }
37
38 $TOOLTIP->move ($x, $y);
39 $TOOLTIP->check_size;
40 $TOOLTIP->update;
41 } 61 }
42 62
43 return; 63 return;
44 } 64 }
45 } 65 }
… …
49 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
50} 70}
51 71
52# class methods for events 72# class methods for events
53sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
54 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
55 if $FOCUS; 75 if $FOCUS;
56} 76}
57 77
58sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
59 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
60 if $FOCUS; 80 if $FOCUS;
61} 81}
62 82
63sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
64 my ($ev) = @_; 84 my ($ev) = @_;
… …
73 check_tooltip; 93 check_tooltip;
74 } 94 }
75 95
76 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
77 97
78 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
79 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
80 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
81 }
82} 100}
83 101
84sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
85 my ($ev) = @_; 103 my ($ev) = @_;
86 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
87 105
88 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
89 107
90 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
91 109
92 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
93 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
94 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
95 }
96 112
97 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
98 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
99 $grab->update if $grab; 115 $grab->update if $grab;
100 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
116 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
117 133
118 check_tooltip; 134 check_tooltip;
119 } 135 }
120 136
121 if ($HOVER) {
122 ($x, $y) = $HOVER->coord2local ($x, $y);
123 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
124 } 138 if $HOVER;
125} 139}
126 140
127# convert position array to integers 141# convert position array to integers
128sub harmonize { 142sub harmonize {
129 my ($vals) = @_; 143 my ($vals) = @_;
… …
135 $rem += $_ - $i; 149 $rem += $_ - $i;
136 $_ = $i; 150 $_ = $i;
137 } 151 }
138} 152}
139 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
170# call when resolution changes etc.
171sub rescale_widgets {
172 my ($sx, $sy) = @_;
173
174 for my $widget (values %WIDGET) {
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
179 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
180 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
181 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
182 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
183 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
184 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_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
189 }
190 }
191
192 reconfigure_widgets;
193}
194
140############################################################################# 195#############################################################################
141 196
142package CFClient::UI::Base; 197package CFClient::UI::Base;
143 198
144use strict; 199use strict;
… …
147 202
148sub new { 203sub new {
149 my $class = shift; 204 my $class = shift;
150 205
151 my $self = bless { 206 my $self = bless {
152 x => 0, 207 x => "center",
153 y => 0, 208 y => "center",
154 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
155 can_events => 1, 212 can_events => 1,
156 @_ 213 @_
157 }, $class; 214 }, $class;
158 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
159 for (keys %$self) { 218 for (keys %$self) {
160 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
161 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
162 } 221 }
163 } 222 }
164 223
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 }
235
165 $self 236 $self
166} 237}
167 238
168sub destroy { 239sub destroy {
169 my ($self) = @_; 240 my ($self) = @_;
… …
178 return if $self->{parent}; 249 return if $self->{parent};
179 250
180 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
181} 252}
182 253
183sub hide { 254sub set_visible {
184 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};
185 278
186 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
187 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
188 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
189 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
190 if $self->{parent}; 313 if $self->{parent};
191} 314}
192 315
193sub move { 316sub move_abs {
194 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
195 318
196 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
197 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
198 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
199 322
200 $self->update; 323 $self->update;
201} 324}
202 325
203sub set_size { 326sub set_size {
204 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
205 328
206 $self->{user_w} = $w; 329 $self->{force_w} = $w;
207 $self->{user_h} = $h; 330 $self->{force_h} = $h;
208 331
209 $self->check_size; 332 $self->realloc;
210} 333}
211 334
212sub size_request { 335sub size_request {
213 require Carp; 336 require Carp;
214 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
216 339
217sub configure { 340sub configure {
218 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
219 342
220 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
221 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
222 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
223 348
224 # use alignment to adjust x, y 349 # use alignment to adjust x, y
225 350
226 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
227 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
228
229 ($w, $h) = ($w2, $h2);
230 } 353 }
231 354
232 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
233 $self->{x} = $x; 356 $self->{x} = $x;
234 $self->{y} = $y; 357 $self->{y} = $y;
235 $self->update; 358 $self->update;
236 } 359 }
237 360
238 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
239 $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;
240 } 368 }
241} 369}
242 370
243sub size_allocate { 371sub size_allocate {
244 # nothing to be done 372 # nothing to be done
245} 373}
246 374
247sub children { 375sub children {
376 # nop
248} 377}
249 378
250# call when resolution changes etc. 379sub visible_children {
251sub reconfigure { 380 $_[0]->children
252 my ($self) = @_;
253
254 $_->reconfigure
255 for $self->children;
256
257 $self->check_size;
258 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $self->{w}, $self->{h}];
259 $self->update;
260} 381}
261 382
262sub set_max_size { 383sub set_max_size {
263 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
264 385
265 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
266 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 }
267} 404}
268 405
269# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
270sub coord2local { 407sub coord2local {
271 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
… …
286 return if $FOCUS == $self; 423 return if $FOCUS == $self;
287 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
288 425
289 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
290 427
291 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
292 429
293 $focus->update if $focus; 430 $focus->update if $focus;
294 $FOCUS->update; 431 $FOCUS->update;
295} 432}
296 433
… …
299 436
300 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
301 438
302 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
303 440
304 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
305 442
306 $focus->update if $focus; #? 443 $focus->update if $focus; #?
307}
308 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
309sub mouse_motion { } 449sub mouse_motion { 0 }
310sub button_up { } 450sub button_up { 0 }
311sub key_down { } 451sub key_down { 0 }
312sub key_up { } 452sub key_up { 0 }
313 453
314sub button_down { 454sub button_down {
315 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
316 456
317 $self->focus_in; 457 $self->focus_in;
318}
319 458
320sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
321sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
322sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
323sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
324sub 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
325 535
326sub draw { 536sub draw {
327 my ($self) = @_; 537 my ($self) = @_;
328 538
329 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);
330 550
331 glPushMatrix; 551 glPushMatrix;
332 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
333 $self->_draw; 553 $self->_draw;
334 glPopMatrix; 554 glPopMatrix;
… …
346 glVertex $x , $y + $self->{h}; 566 glVertex $x , $y + $self->{h};
347 glEnd; 567 glEnd;
348 glDisable GL_BLEND; 568 glDisable GL_BLEND;
349 } 569 }
350 570
351 if ($ENV{PCLIENT_DEBUG}) { 571 if ($ENV{CFPLUS_DEBUG} & 1) {
352 glPushMatrix; 572 glPushMatrix;
353 glColor 1, 1, 0, 1; 573 glColor 1, 1, 0, 1;
354 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 574 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
355 glBegin GL_LINE_LOOP; 575 glBegin GL_LINE_LOOP;
356 glVertex 0 , 0; 576 glVertex 0 , 0;
357 glVertex $self->{w}, 0; 577 glVertex $self->{w} - 1, 0;
358 glVertex $self->{w}, $self->{h}; 578 glVertex $self->{w} - 1, $self->{h} - 1;
359 glVertex 0 , $self->{h}; 579 glVertex 0 , $self->{h} - 1;
360 glEnd; 580 glEnd;
361 glPopMatrix; 581 glPopMatrix;
362 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;
363 } 583 }
364} 584}
365 585
366sub _draw { 586sub _draw {
367 my ($self) = @_; 587 my ($self) = @_;
368 588
369 warn "no draw defined for $self\n"; 589 warn "no draw defined for $self\n";
370} 590}
371 591
372sub find_widget {
373 my ($self, $x, $y) = @_;
374
375 return () unless $self->{can_events};
376
377 return $self
378 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
379 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
380
381 ()
382}
383
384sub set_parent {
385 my ($self, $parent) = @_;
386
387 Scalar::Util::weaken ($self->{parent} = $parent);
388
389 $self->check_size
390 unless exists $self->{req_w};
391}
392
393sub check_size {
394 my ($self, $forced) = @_;
395
396 $self->{force_alloc} = 1 if $forced;
397 $CFClient::UI::ROOT->{check_size}{$self} = $self;
398}
399
400sub update {
401 my ($self) = @_;
402
403 $self->{parent}->update
404 if $self->{parent};
405}
406
407sub connect {
408 my ($self, $signal, $cb) = @_;
409
410 push @{ $self->{signal_cb}{$signal} }, $cb;
411}
412
413sub emit {
414 my ($self, $signal, @args) = @_;
415
416 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
417}
418
419sub DESTROY { 592sub DESTROY {
420 my ($self) = @_; 593 my ($self) = @_;
421 594
595 delete $WIDGET{$self+0};
422 #$self->deactivate; 596 #$self->deactivate;
423} 597}
424 598
425############################################################################# 599#############################################################################
426 600
… …
435 my $class = shift; 609 my $class = shift;
436 610
437 # range [value, low, high, page] 611 # range [value, low, high, page]
438 612
439 $class->SUPER::new ( 613 $class->SUPER::new (
440 bg => [0, 0, 0, 0.2], 614 #bg => [0, 0, 0, 0.2],
441 active_bg => [1, 1, 1, 0.5], 615 #active_bg => [1, 1, 1, 0.5],
442 @_ 616 @_
443 ) 617 )
444} 618}
445 619
446sub _draw { 620sub _draw {
447 my ($self) = @_; 621 my ($self) = @_;
448 622
623 my $color = $FOCUS == $self && $self->{active_bg}
624 ? $self->{active_bg}
625 : $self->{bg};
626
627 if ($color && (@$color < 4 || $color->[3])) {
449 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
450 629
451 glEnable GL_BLEND; 630 glEnable GL_BLEND;
452 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 631 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
453 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 632 glColor @$color;
454 633
455 glBegin GL_QUADS; 634 glBegin GL_QUADS;
456 glVertex 0 , 0; 635 glVertex 0 , 0;
457 glVertex 0 , $h; 636 glVertex 0 , $h;
458 glVertex $w, $h; 637 glVertex $w, $h;
459 glVertex $w, 0; 638 glVertex $w, 0;
460 glEnd; 639 glEnd;
461 640
462 glDisable GL_BLEND; 641 glDisable GL_BLEND;
642 }
463} 643}
464 644
465############################################################################# 645#############################################################################
466 646
467package CFClient::UI::Empty; 647package CFClient::UI::Empty;
… …
472 my ($class, %arg) = @_; 652 my ($class, %arg) = @_;
473 $class->SUPER::new (can_events => 0, %arg); 653 $class->SUPER::new (can_events => 0, %arg);
474} 654}
475 655
476sub size_request { 656sub size_request {
477 (0, 0) 657 my ($self) = @_;
658
659 ($self->{w} + 0, $self->{h} + 0)
478} 660}
479 661
480sub draw { } 662sub draw { }
481 663
482############################################################################# 664#############################################################################
… …
486our @ISA = CFClient::UI::Base::; 668our @ISA = CFClient::UI::Base::;
487 669
488sub new { 670sub new {
489 my ($class, %arg) = @_; 671 my ($class, %arg) = @_;
490 672
491 my $children = delete $arg{children} || []; 673 my $children = delete $arg{children};
492 674
493 my $self = $class->SUPER::new ( 675 my $self = $class->SUPER::new (
494 children => [], 676 children => [],
495 can_events => 0, 677 can_events => 0,
496 %arg, 678 %arg,
497 ); 679 );
680
498 $self->add ($_) for @$children; 681 $self->add (@$children)
682 if $children;
499 683
500 $self 684 $self
501} 685}
502 686
503sub add { 687sub add {
… …
511 $self->{children} = [ 695 $self->{children} = [
512 sort { $a->{z} <=> $b->{z} } 696 sort { $a->{z} <=> $b->{z} }
513 @{$self->{children}}, @widgets 697 @{$self->{children}}, @widgets
514 ]; 698 ];
515 699
516 $self->check_size (1); 700 $self->realloc;
517 $self->update;
518} 701}
519 702
520sub children { 703sub children {
521 @{ $_[0]{children} } 704 @{ $_[0]{children} }
522} 705}
… …
527 delete $child->{parent}; 710 delete $child->{parent};
528 $child->hide; 711 $child->hide;
529 712
530 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 713 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
531 714
532 $self->check_size; 715 $self->realloc;
533 $self->update;
534} 716}
535 717
536sub clear { 718sub clear {
537 my ($self) = @_; 719 my ($self) = @_;
538 720
… …
542 for (@$children) { 724 for (@$children) {
543 delete $_->{parent}; 725 delete $_->{parent};
544 $_->hide; 726 $_->hide;
545 } 727 }
546 728
547 $self->check_size; 729 $self->realloc;
548 $self->update;
549} 730}
550 731
551sub find_widget { 732sub find_widget {
552 my ($self, $x, $y) = @_; 733 my ($self, $x, $y) = @_;
553 734
554 $x -= $self->{x}; 735 $x -= $self->{x};
555 $y -= $self->{y}; 736 $y -= $self->{y};
556 737
557 my $res; 738 my $res;
558 739
559 for (reverse @{ $self->{children} }) { 740 for (reverse $self->visible_children) {
560 $res = $_->find_widget ($x, $y) 741 $res = $_->find_widget ($x, $y)
561 and return $res; 742 and return $res;
562 } 743 }
563 744
564 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 745 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
613 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
614} 795}
615 796
616############################################################################# 797#############################################################################
617 798
799# back-buffered drawing area
800
618package CFClient::UI::Window; 801package CFClient::UI::Window;
619 802
620our @ISA = CFClient::UI::Bin::; 803our @ISA = CFClient::UI::Bin::;
621 804
622use CFClient::OpenGL; 805use CFClient::OpenGL;
… …
628} 811}
629 812
630sub update { 813sub update {
631 my ($self) = @_; 814 my ($self) = @_;
632 815
633 $ROOT->on_refresh ($self => sub { $self->render_child }); 816 $ROOT->on_post_alloc ($self => sub { $self->render_child });
634 $self->SUPER::update; 817 $self->SUPER::update;
635} 818}
636 819
637sub size_allocate { 820sub size_allocate {
638 my ($self, $w, $h) = @_; 821 my ($self, $w, $h) = @_;
… …
640 $self->SUPER::size_allocate ($w, $h); 823 $self->SUPER::size_allocate ($w, $h);
641 $self->update; 824 $self->update;
642} 825}
643 826
644sub _render { 827sub _render {
828 my ($self) = @_;
829
645 $_[0]{children}[0]->draw; 830 $self->{children}[0]->draw;
646} 831}
647 832
648sub render_child { 833sub render_child {
649 my ($self) = @_; 834 my ($self) = @_;
650 835
651 $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 {
652 glClearColor 0, 0, 0, 0; 837 glClearColor 0, 0, 0, 0;
653 glClear GL_COLOR_BUFFER_BIT; 838 glClear GL_COLOR_BUFFER_BIT;
654 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
655 $self->_render; 847 $self->_render;
656# glColorMask 1, 1, 1, 0;
657# glEnable GL_BLEND;
658# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
659# glRasterPos 0, 0;
660# glCopyPixels 0, 0, $self->{w}, $self->{h};
661# glDisable GL_BLEND;
662# glColorMask 1, 1, 1, 1;
663 }; 848 };
664} 849}
665 850
666sub _draw { 851sub _draw {
667 my ($self) = @_; 852 my ($self) = @_;
668 853
669 my ($w, $h) = ($self->w, $self->h); 854 my ($w, $h) = @$self{qw(w h)};
670 855
671 my $tex = $self->{texture} 856 my $tex = $self->{texture}
672 or return; 857 or return;
673 858
674 glEnable GL_TEXTURE_2D; 859 glEnable GL_TEXTURE_2D;
675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 860 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
676 glColor 0, 0, 0, 1; 861 glColor 1, 1, 1, 1;
677 862
678 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 863 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
679 864
680 glDisable GL_TEXTURE_2D; 865 glDisable GL_TEXTURE_2D;
681} 866}
… …
684 869
685package CFClient::UI::ViewPort; 870package CFClient::UI::ViewPort;
686 871
687our @ISA = CFClient::UI::Window::; 872our @ISA = CFClient::UI::Window::;
688 873
874sub new {
875 my $class = shift;
876
877 $class->SUPER::new (
878 scroll_x => 0,
879 scroll_y => 1,
880 @_,
881 )
882}
883
689sub size_request { 884sub size_request {
690 my ($self) = @_; 885 my ($self) = @_;
691 886
692 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 887 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
693 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
694 888
695 @$self{qw(child_w child_h)} 889 $w = 10 if $self->{scroll_x};
890 $h = 10 if $self->{scroll_y};
891
892 ($w, $h)
696} 893}
697 894
698sub size_allocate { 895sub size_allocate {
699 my ($self, $w, $h) = @_; 896 my ($self, $w, $h) = @_;
700 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);
701 $self->update; 904 $self->update;
702} 905}
703 906
704sub set_offset { 907sub set_offset {
705 my ($self, $x, $y) = @_; 908 my ($self, $x, $y) = @_;
… …
739} 942}
740 943
741sub _render { 944sub _render {
742 my ($self) = @_; 945 my ($self) = @_;
743 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
744 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 950 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
745 951
746 $self->SUPER::_render; 952 $self->SUPER::_render;
747} 953}
748 954
749############################################################################# 955#############################################################################
750 956
751package CFClient::UI::ScrolledWindow; 957package CFClient::UI::ScrolledWindow;
752 958
753our @ISA = CFClient::UI::HBox::; 959our @ISA = CFClient::UI::HBox::;
960
961sub new {
962 my ($class, %arg) = @_;
963
964 my $child = delete $arg{child};
965
966 my $self;
967
968 my $slider = new CFClient::UI::Slider
969 vertical => 1,
970 range => [0, 0, 1, 0.01], # HACK fix
971 on_changed => sub {
972 $self->{vp}->set_offset (0, $_[1]);
973 },
974 ;
975
976 $self = $class->SUPER::new (
977 vp => (new CFClient::UI::ViewPort expand => 1),
978 slider => $slider,
979 %arg,
980 );
981
982 $self->SUPER::add ($self->{vp}, $self->{slider});
983 $self->add ($child) if $child;
984
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]);
1011}
1012
1013#TODO# update range on size_allocate depending on child
1014# update viewport offset on scroll
1015
1016#############################################################################
1017
1018package CFClient::UI::Frame;
1019
1020our @ISA = CFClient::UI::Bin::;
1021
1022use CFClient::OpenGL;
754 1023
755sub new { 1024sub new {
756 my $class = shift; 1025 my $class = shift;
757 1026
758 my $self;
759
760 my $slider = new CFClient::UI::Slider
761 vertical => 1,
762 range => [0, 0, 1, 0.01], # HACK fix
763 connect_changed => sub {
764 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
765 },
766 ;
767
768 $self = $class->SUPER::new ( 1027 $class->SUPER::new (
769 vp => (new CFClient::UI::ViewPort), 1028 bg => undef,
770 slider => $slider,
771 @_, 1029 @_,
1030 )
1031}
1032
1033sub _draw {
1034 my ($self) = @_;
1035
1036 if ($self->{bg}) {
1037 my ($w, $h) = @$self{qw(w h)};
1038
1039 glEnable GL_BLEND;
1040 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1041 glColor @{ $self->{bg} };
1042
1043 glBegin GL_QUADS;
1044 glVertex 0 , 0;
1045 glVertex 0 , $h;
1046 glVertex $w, $h;
1047 glVertex $w, 0;
1048 glEnd;
1049
1050 glDisable GL_BLEND;
1051 }
1052
1053 $self->SUPER::_draw;
1054}
1055
1056#############################################################################
1057
1058package CFClient::UI::FancyFrame;
1059
1060our @ISA = CFClient::UI::Bin::;
1061
1062use CFClient::OpenGL;
1063
1064my $bg =
1065 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1066 mipmap => 1, wrap => 1;
1067
1068my @border =
1069 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1070 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1071
1072sub new {
1073 my ($class, %arg) = @_;
1074
1075 my $title = delete $arg{title};
1076
1077 my $self = $class->SUPER::new (
1078 bg => [1, 1, 1, 1],
1079 border_bg => [1, 1, 1, 1],
1080 border => 0.6,
1081 can_events => 1,
1082 min_w => 16,
1083 min_h => 16,
1084 %arg,
772 ); 1085 );
773 1086
774 $self->{vp}->add ($self->{scrolled});
775 $self->add ($self->{vp});
776 $self->add ($self->{slider});
777
778 $self
779}
780
781#TODO# update range on size_allocate depeneing on child
782# update viewport offset on scroll
783
784#############################################################################
785
786package CFClient::UI::Frame;
787
788our @ISA = CFClient::UI::Bin::;
789
790use CFClient::OpenGL;
791
792#############################################################################
793
794package CFClient::UI::FancyFrame;
795
796our @ISA = CFClient::UI::Bin::;
797
798use CFClient::OpenGL;
799
800my @tex =
801 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
802 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
803
804sub new {
805 my $class = shift;
806
807 # TODO: user_x, user_y, overwrite moveto?
808
809 my $self = $class->SUPER::new (
810 bg => [1, 1, 1, 1],
811 border_bg => [1, 1, 1, 1],
812 border => 0.6,
813 can_events => 1,
814 @_
815 );
816
817 $self->{title} &&= new CFClient::UI::Label 1087 $self->{title} = new CFClient::UI::Label
818 align => 0, 1088 align => 0,
819 valign => 1, 1089 valign => 1,
820 text => $self->{title}, 1090 text => $title,
821 fontsize => $self->{border}; 1091 fontsize => $self->{border}
1092 if defined $title;
822 1093
823 $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};
824} 1102}
825 1103
826sub border { 1104sub border {
827 int $_[0]{border} * $::FONTSIZE 1105 int $_[0]{border} * $::FONTSIZE
828} 1106}
829 1107
830sub size_request { 1108sub size_request {
831 my ($self) = @_; 1109 my ($self) = @_;
1110
1111 $self->{title}->size_request
1112 if $self->{title};
832 1113
833 my ($w, $h) = $self->SUPER::size_request; 1114 my ($w, $h) = $self->SUPER::size_request;
834 1115
835 ( 1116 (
836 $w + $self->border * 2, 1117 $w + $self->border * 2,
… …
839} 1120}
840 1121
841sub size_allocate { 1122sub size_allocate {
842 my ($self, $w, $h) = @_; 1123 my ($self, $w, $h) = @_;
843 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
844 $h -= List::Util::max 0, $self->border * 2; 1133 $h -= List::Util::max 0, $border * 2;
845 $w -= List::Util::max 0, $self->border * 2; 1134 $w -= List::Util::max 0, $border * 2;
846 1135
847 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
848 if $self->{title};
849
850 $self->child->configure ($self->border, $self->border, $w, $h); 1136 $self->child->configure ($border, $border, $w, $h);
851} 1137}
852 1138
853sub button_down { 1139sub button_down {
854 my ($self, $ev, $x, $y) = @_; 1140 my ($self, $ev, $x, $y) = @_;
855 1141
… …
871 my ($ev, $x, $y) = @_; 1157 my ($ev, $x, $y) = @_;
872 1158
873 my $dx = $ev->{x} - $ox; 1159 my $dx = $ev->{x} - $ox;
874 my $dy = $ev->{y} - $oy; 1160 my $dy = $ev->{y} - $oy;
875 1161
876 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1162 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
877 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1163 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1164
1165 $self->realloc;
878 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1166 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
879 $self->check_size;
880 }; 1167 };
881 1168
882 } elsif ($lr ^ $td) { 1169 } elsif ($lr ^ $td) {
883 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1170 my ($ox, $oy) = ($ev->{x}, $ev->{y});
884 my ($bx, $by) = ($self->{x}, $self->{y}); 1171 my ($bx, $by) = ($self->{x}, $self->{y});
… …
886 $self->{motion} = sub { 1173 $self->{motion} = sub {
887 my ($ev, $x, $y) = @_; 1174 my ($ev, $x, $y) = @_;
888 1175
889 ($x, $y) = ($ev->{x}, $ev->{y}); 1176 ($x, $y) = ($ev->{x}, $ev->{y});
890 1177
891 $self->move ($bx + $x - $ox, $by + $y - $oy); 1178 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
892 $self->update;
893 }; 1179 };
1180 } else {
1181 return 0;
1182 }
1183
894 } 1184 1
895} 1185}
896 1186
897sub button_up { 1187sub button_up {
898 my ($self, $ev, $x, $y) = @_; 1188 my ($self, $ev, $x, $y) = @_;
899 1189
900 delete $self->{motion}; 1190 !!delete $self->{motion}
901} 1191}
902 1192
903sub mouse_motion { 1193sub mouse_motion {
904 my ($self, $ev, $x, $y) = @_; 1194 my ($self, $ev, $x, $y) = @_;
905 1195
906 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1196 $self->{motion}->($ev, $x, $y) if $self->{motion};
1197
1198 !!$self->{motion}
907} 1199}
908 1200
909sub _draw { 1201sub _draw {
910 my ($self) = @_; 1202 my ($self) = @_;
911 1203
1204 my $child = $self->{children}[0];
1205
912 my ($w, $h ) = ($self->{w}, $self->{h}); 1206 my ($w, $h ) = ($self->{w}, $self->{h});
913 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1207 my ($cw, $ch) = ($child->{w}, $child->{h});
914 1208
915 glEnable GL_TEXTURE_2D; 1209 glEnable GL_TEXTURE_2D;
916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1210 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
917 1211
918 my $border = $self->border; 1212 my $border = $self->border;
919 1213
920 glColor @{ $self->{border_bg} }; 1214 glColor @{ $self->{border_bg} };
921 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1215 $border[0]->draw_quad_alpha (0, 0, $w, $border);
922 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1216 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
923 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1217 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
924 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1218 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
925 1219
926 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1220 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
927 my $bg = $tex[0]; 1221 glColor @{ $self->{bg} };
928 1222
929 # TODO: repeat texture not scale 1223 # TODO: repeat texture not scale
1224 # solve this better(?)
930 my $rep_x = $cw / $bg->{w}; 1225 $bg->{s} = $cw / $bg->{w};
931 my $rep_y = $ch / $bg->{h}; 1226 $bg->{t} = $ch / $bg->{h};
932
933 glColor @{ $self->{bg} };
934
935 $bg->{s} = $rep_x;
936 $bg->{t} = $rep_y;
937 $bg->{wrap_mode} = 1;
938 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1227 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
939 } 1228 }
940 1229
941 glDisable GL_TEXTURE_2D; 1230 glDisable GL_TEXTURE_2D;
942 1231
943 $self->{title}->draw if $self->{title};
944
945 $self->child->draw; 1232 $child->draw;
1233
1234 if ($self->{title}) {
1235 glTranslate 0, $border - $self->{h};
1236 $self->{title}->_draw;
1237 }
946} 1238}
947 1239
948############################################################################# 1240#############################################################################
949 1241
950package CFClient::UI::Table; 1242package CFClient::UI::Table;
… …
958sub new { 1250sub new {
959 my $class = shift; 1251 my $class = shift;
960 1252
961 $class->SUPER::new ( 1253 $class->SUPER::new (
962 col_expand => [], 1254 col_expand => [],
963 @_ 1255 @_,
964 ) 1256 )
1257}
1258
1259sub children {
1260 grep $_, map @$_, grep $_, @{ $_[0]{children} }
965} 1261}
966 1262
967sub add { 1263sub add {
968 my ($self, $x, $y, $child) = @_; 1264 my ($self, $x, $y, $child) = @_;
969 1265
970 $child->set_parent ($self); 1266 $child->set_parent ($self);
971 $self->{children}[$y][$x] = $child; 1267 $self->{children}[$y][$x] = $child;
972 1268
973 $child->check_size; 1269 $self->realloc;
974} 1270}
975 1271
976sub children {
977 grep $_, map @$_, grep $_, @{ $_[0]{children} }
978}
979
980# 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?
981sub clear { 1273sub clear {
982 my ($self) = @_; 1274 my ($self) = @_;
983 1275
984 my @children = $self->children; 1276 my @children = $self->children;
985 delete $self->{children}; 1277 delete $self->{children};
… …
987 for (@children) { 1279 for (@children) {
988 delete $_->{parent}; 1280 delete $_->{parent};
989 $_->hide; 1281 $_->hide;
990 } 1282 }
991 1283
992 $self->update; 1284 $self->realloc;
993} 1285}
994 1286
995sub get_wh { 1287sub get_wh {
996 my ($self) = @_; 1288 my ($self) = @_;
997 1289
… …
1028sub size_allocate { 1320sub size_allocate {
1029 my ($self, $w, $h) = @_; 1321 my ($self, $w, $h) = @_;
1030 1322
1031 my ($ws, $hs) = $self->get_wh; 1323 my ($ws, $hs) = $self->get_wh;
1032 1324
1033 my $req_w = sum @$ws; 1325 my $req_w = (sum @$ws) || 1;
1034 my $req_h = sum @$hs; 1326 my $req_h = (sum @$hs) || 1;
1035 1327
1036 # TODO: nicer code && do row_expand 1328 # TODO: nicer code && do row_expand
1037 my @col_expand = @{$self->{col_expand}}; 1329 my @col_expand = @{$self->{col_expand}};
1038 @col_expand = (1) x @$ws unless @col_expand; 1330 @col_expand = (1) x @$ws unless @col_expand;
1039 my $col_expand = (sum @col_expand) || 1; 1331 my $col_expand = (sum @col_expand) || 1;
… …
1093 } 1385 }
1094} 1386}
1095 1387
1096############################################################################# 1388#############################################################################
1097 1389
1098package CFClient::UI::HBox; 1390package CFClient::UI::Box;
1099
1100# TODO: wrap into common Box base class
1101 1391
1102our @ISA = CFClient::UI::Container::; 1392our @ISA = CFClient::UI::Container::;
1103 1393
1104sub size_request { 1394sub size_request {
1105 my ($self) = @_; 1395 my ($self) = @_;
1106 1396
1107 my @alloc = map [$_->size_request], @{$self->{children}}; 1397 $self->{vertical}
1108 1398 ? (
1109 ( 1399 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1110 (List::Util::sum map $_->[0], @alloc), 1400 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1111 (List::Util::max map $_->[1], @alloc), 1401 )
1112 ) 1402 : (
1403 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1404 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1405 )
1113} 1406}
1114 1407
1115sub size_allocate { 1408sub size_allocate {
1116 my ($self, $w, $h) = @_; 1409 my ($self, $w, $h) = @_;
1117 1410
1118 ($h, $w) = ($w, $h); 1411 my $space = $self->{vertical} ? $h : $w;
1119
1120 my $children = $self->{children}; 1412 my $children = $self->{children};
1121 1413
1122 my @h = map $_->{req_w}, @$children; 1414 my @req;
1123 1415
1124 my $req_h = List::Util::sum @h; 1416 if ($self->{homogeneous}) {
1125 1417 @req = ($space / (@$children || 1)) x @$children;
1126 if ($req_h > $h) {
1127 # ah well, not enough space
1128 $_ *= $h / $req_h for @h;
1129 } 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 {
1130 my $exp = List::Util::sum map $_->{expand}, @$children; 1426 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1131 $exp ||= 1;
1132 1427
1428 $space = ($space - $req) / $expand; # remaining space to give away
1429
1430 $req[$_] += $space * $children->[$_]{expand}
1133 for (0 .. $#$children) { 1431 for 0 .. $#$children;
1134 my $child = $children->[$_];
1135
1136 my $alloc_h = $h[$_];
1137 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1138 $h[$_] = $alloc_h;
1139 } 1432 }
1140 } 1433 }
1141 1434
1142 CFClient::UI::harmonize \@h; 1435 CFClient::UI::harmonize \@req;
1143 1436
1144 my $y = 0; 1437 my $pos = 0;
1145 for (0 .. $#$children) { 1438 for (0 .. $#$children) {
1146 my $child = $children->[$_];
1147 my $h = $h[$_]; 1439 my $alloc = $req[$_];
1148 $child->configure ($y, 0, $h, $w); 1440 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1149 1441
1150 $y += $h; 1442 $pos += $alloc;
1151 } 1443 }
1152 1444
1153 1 1445 1
1154} 1446}
1155 1447
1156############################################################################# 1448#############################################################################
1157 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
1158package CFClient::UI::VBox; 1465package CFClient::UI::VBox;
1159 1466
1160# TODO: wrap into common Box base class
1161
1162our @ISA = CFClient::UI::Container::; 1467our @ISA = CFClient::UI::Box::;
1163 1468
1164sub size_request { 1469sub new {
1165 my ($self) = @_; 1470 my $class = shift;
1166 1471
1167 my @alloc = map [$_->size_request], @{$self->{children}}; 1472 $class->SUPER::new (
1168 1473 vertical => 1,
1169 ( 1474 @_,
1170 (List::Util::max map $_->[0], @alloc),
1171 (List::Util::sum map $_->[1], @alloc),
1172 ) 1475 )
1173} 1476}
1174 1477
1175sub size_allocate {
1176 my ($self, $w, $h) = @_;
1177
1178 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1179
1180 my $children = $self->{children};
1181
1182 my @h = map $_->{req_h}, @$children;
1183
1184 my $req_h = List::Util::sum @h;
1185
1186 if ($req_h > $h) {
1187 # ah well, not enough space
1188 $_ *= $h / $req_h for @h;
1189 } else {
1190 my $exp = List::Util::sum map $_->{expand}, @$children;
1191 $exp ||= 1;
1192
1193 for (0 .. $#$children) {
1194 my $child = $children->[$_];
1195
1196 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1197 }
1198 }
1199
1200 CFClient::UI::harmonize \@h;
1201
1202 my $y = 0;
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205 my $h = $h[$_];
1206 $child->configure (0, $y, $w, $h);
1207
1208 $y += $h;
1209 }
1210
1211 1
1212}
1213
1214############################################################################# 1478#############################################################################
1215 1479
1216package CFClient::UI::Label; 1480package CFClient::UI::Label;
1217 1481
1218our @ISA = CFClient::UI::Base::; 1482our @ISA = CFClient::UI::DrawBG::;
1219 1483
1220use CFClient::OpenGL; 1484use CFClient::OpenGL;
1221 1485
1222sub new { 1486sub new {
1223 my ($class, %arg) = @_; 1487 my ($class, %arg) = @_;
1224 1488
1225 my $self = $class->SUPER::new ( 1489 my $self = $class->SUPER::new (
1226 fg => [1, 1, 1], 1490 fg => [1, 1, 1],
1491 #bg => none
1492 #active_bg => none
1227 #font => default_font 1493 #font => default_font
1228 #text => initial text 1494 #text => initial text
1229 #markup => initial narkup 1495 #markup => initial narkup
1496 #max_w => maximum pixel width
1497 ellipsise => 3, # end
1230 layout => (new CFClient::Layout), 1498 layout => (new CFClient::Layout),
1231 fontsize => 1, 1499 fontsize => 1,
1232 align => -1, 1500 align => -1,
1233 valign => -1, 1501 valign => -1,
1234 padding => 2, 1502 padding_x => 2,
1503 padding_y => 2,
1235 can_events => 0, 1504 can_events => 0,
1236 %arg 1505 %arg
1237 ); 1506 );
1238 1507
1239 if (exists $self->{template}) { 1508 if (exists $self->{template}) {
… …
1249 } 1518 }
1250 1519
1251 $self 1520 $self
1252} 1521}
1253 1522
1254sub escape { 1523sub escape($) {
1255 local $_ = $_[1]; 1524 local $_ = $_[0];
1256 1525
1257 s/&/&amp;/g; 1526 s/&/&amp;/g;
1258 s/>/&gt;/g; 1527 s/>/&gt;/g;
1259 s/</&lt;/g; 1528 s/</&lt;/g;
1260 1529
1261 $_[1] 1530 $_
1262} 1531}
1263 1532
1264sub update { 1533sub update {
1265 my ($self) = @_; 1534 my ($self) = @_;
1266 1535
… …
1275 $self->{text} = "T$text"; 1544 $self->{text} = "T$text";
1276 1545
1277 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1546 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1278 $self->{layout}->set_text ($text); 1547 $self->{layout}->set_text ($text);
1279 1548
1549 $self->realloc;
1280 $self->update; 1550 $self->update;
1281 $self->check_size;
1282} 1551}
1283 1552
1284sub set_markup { 1553sub set_markup {
1285 my ($self, $markup) = @_; 1554 my ($self, $markup) = @_;
1286 1555
… …
1290 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1559 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1291 1560
1292 $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;
1293 $self->{layout}->set_markup ($markup); 1562 $self->{layout}->set_markup ($markup);
1294 1563
1564 $self->realloc;
1295 $self->update; 1565 $self->update;
1296 $self->check_size;
1297} 1566}
1298 1567
1299sub size_request { 1568sub size_request {
1300 my ($self) = @_; 1569 my ($self) = @_;
1301 1570
1302 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1571 $self->{layout}->set_font ($self->{font}) if $self->{font};
1303 $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});
1304 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1575 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1305 1576
1306 my ($w, $h) = $self->{layout}->size; 1577 my ($w, $h) = $self->{layout}->size;
1307 1578
1308 if (exists $self->{template}) { 1579 if (exists $self->{template}) {
… …
1313 1584
1314 $w = List::Util::max $w, $w2; 1585 $w = List::Util::max $w, $w2;
1315 $h = List::Util::max $h, $h2; 1586 $h = List::Util::max $h, $h2;
1316 } 1587 }
1317 1588
1318 ( 1589 ($w, $h)
1319 $w + $self->{padding} * 2,
1320 $h + $self->{padding} * 2,
1321 )
1322} 1590}
1323 1591
1324sub size_allocate { 1592sub size_allocate {
1325 my ($self, $w, $h) = @_; 1593 my ($self, $w, $h) = @_;
1326 1594
1595 delete $self->{ox};
1596
1327 delete $self->{texture}; 1597 delete $self->{texture}
1598 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1328} 1599}
1329 1600
1330sub set_fontsize { 1601sub set_fontsize {
1331 my ($self, $fontsize) = @_; 1602 my ($self, $fontsize) = @_;
1332 1603
1333 $self->{fontsize} = $fontsize; 1604 $self->{fontsize} = $fontsize;
1334 delete $self->{texture}; 1605 delete $self->{texture};
1335 1606
1336 $self->update; 1607 $self->realloc;
1337 $self->check_size;
1338} 1608}
1339 1609
1340sub _draw { 1610sub _draw {
1341 my ($self) = @_; 1611 my ($self) = @_;
1612
1613 $self->SUPER::_draw; # draw background, if applicable
1342 1614
1343 my $tex = $self->{texture} ||= do { 1615 my $tex = $self->{texture} ||= do {
1344 $self->{layout}->set_foreground (@{$self->{fg}}); 1616 $self->{layout}->set_foreground (@{$self->{fg}});
1345 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1617 $self->{layout}->set_font ($self->{font}) if $self->{font};
1346 $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});
1347 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1621 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1348 1622
1349 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1623 new_from_layout CFClient::Texture $self->{layout}
1624 };
1350 1625
1626 unless (exists $self->{ox}) {
1351 $self->{ox} = int $self->{align} < 0 ? $self->{padding} 1627 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1352 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1628 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1353 : ($self->{w} - $tex->{w}) * 0.5; 1629 : ($self->{w} - $tex->{w}) * 0.5);
1354 1630
1355 $self->{oy} = int $self->{valign} < 0 ? $self->{padding} 1631 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1356 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1632 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1357 : ($self->{h} - $tex->{h}) * 0.5; 1633 : ($self->{h} - $tex->{h}) * 0.5);
1358
1359 $tex
1360 }; 1634 };
1361 1635
1362 glEnable GL_TEXTURE_2D; 1636 glEnable GL_TEXTURE_2D;
1363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1637 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1364 1638
… …
1390 active_fg => [0, 0, 0], 1664 active_fg => [0, 0, 0],
1391 can_hover => 1, 1665 can_hover => 1,
1392 can_focus => 1, 1666 can_focus => 1,
1393 valign => 0, 1667 valign => 0,
1394 can_events => 1, 1668 can_events => 1,
1669 #text => ...
1395 @_ 1670 @_
1396 ) 1671 )
1397} 1672}
1398 1673
1399sub _set_text { 1674sub _set_text {
… …
1401 1676
1402 delete $self->{cur_h}; 1677 delete $self->{cur_h};
1403 1678
1404 return if $self->{text} eq $text; 1679 return if $self->{text} eq $text;
1405 1680
1406 delete $self->{texture};
1407
1408 $self->{last_activity} = $::NOW; 1681 $self->{last_activity} = $::NOW;
1409 $self->{text} = $text; 1682 $self->{text} = $text;
1410 1683
1411 $text =~ s/./*/g if $self->{hidden}; 1684 $text =~ s/./*/g if $self->{hidden};
1412 $self->{layout}->set_text ("$text "); 1685 $self->{layout}->set_text ("$text ");
1413 1686
1414 $self->emit (changed => $self->{text}); 1687 $self->_emit (changed => $self->{text});
1688 $self->update;
1415} 1689}
1416 1690
1417sub set_text { 1691sub set_text {
1418 my ($self, $text) = @_; 1692 my ($self, $text) = @_;
1419 1693
1420 $self->{cursor} = length $text; 1694 $self->{cursor} = length $text;
1421 $self->_set_text ($text); 1695 $self->_set_text ($text);
1422 $self->check_size; 1696
1423 $self->update; 1697 $self->realloc;
1424} 1698}
1425 1699
1426sub get_text { 1700sub get_text {
1427 $_[0]{text} 1701 $_[0]{text}
1428} 1702}
… …
1431 my ($self) = @_; 1705 my ($self) = @_;
1432 1706
1433 my ($w, $h) = $self->SUPER::size_request; 1707 my ($w, $h) = $self->SUPER::size_request;
1434 1708
1435 ($w + 1, $h) # add 1 for cursor 1709 ($w + 1, $h) # add 1 for cursor
1436}
1437
1438sub size_allocate {
1439 my ($self, $w, $h) = @_;
1440
1441 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1442} 1710}
1443 1711
1444sub key_down { 1712sub key_down {
1445 my ($self, $ev) = @_; 1713 my ($self, $ev) = @_;
1446 1714
… …
1448 my $sym = $ev->{sym}; 1716 my $sym = $ev->{sym};
1449 my $uni = $ev->{unicode}; 1717 my $uni = $ev->{unicode};
1450 1718
1451 my $text = $self->get_text; 1719 my $text = $self->get_text;
1452 1720
1453 if ($sym == 8) { 1721 if ($uni == 8) {
1454 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1722 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1455 } elsif ($sym == 127) { 1723 } elsif ($uni == 127) {
1456 substr $text, $self->{cursor}, 1, ""; 1724 substr $text, $self->{cursor}, 1, "";
1457 } elsif ($sym == CFClient::SDLK_LEFT) { 1725 } elsif ($sym == CFClient::SDLK_LEFT) {
1458 --$self->{cursor} if $self->{cursor}; 1726 --$self->{cursor} if $self->{cursor};
1459 } elsif ($sym == CFClient::SDLK_RIGHT) { 1727 } elsif ($sym == CFClient::SDLK_RIGHT) {
1460 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1728 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1461 } elsif ($sym == CFClient::SDLK_HOME) { 1729 } elsif ($sym == CFClient::SDLK_HOME) {
1462 $self->{cursor} = 0; 1730 $self->{cursor} = 0;
1463 } elsif ($sym == CFClient::SDLK_END) { 1731 } elsif ($sym == CFClient::SDLK_END) {
1464 $self->{cursor} = length $text; 1732 $self->{cursor} = length $text;
1465 } elsif ($sym == 27) { 1733 } elsif ($uni == 27) {
1466 $self->emit ('escape'); 1734 $self->_emit ('escape');
1467 } elsif ($uni) { 1735 } elsif ($uni) {
1468 substr $text, $self->{cursor}++, 0, chr $uni; 1736 substr $text, $self->{cursor}++, 0, chr $uni;
1737 } else {
1738 return 0;
1469 } 1739 }
1470 1740
1471 $self->_set_text ($text); 1741 $self->_set_text ($text);
1472 $self->update; 1742
1743 $self->realloc;
1744
1745 1
1473} 1746}
1474 1747
1475sub focus_in { 1748sub focus_in {
1476 my ($self) = @_; 1749 my ($self) = @_;
1477 1750
… …
1492 utf8::encode $text; 1765 utf8::encode $text;
1493 $self->{cursor} = length substr $text, 0, $idx; 1766 $self->{cursor} = length substr $text, 0, $idx;
1494 1767
1495 $self->_set_text ($self->{text}); 1768 $self->_set_text ($self->{text});
1496 $self->update; 1769 $self->update;
1770
1771 1
1497} 1772}
1498 1773
1499sub mouse_motion { 1774sub mouse_motion {
1500 my ($self, $ev, $x, $y) = @_; 1775 my ($self, $ev, $x, $y) = @_;
1501# 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
1502} 1779}
1503 1780
1504sub _draw { 1781sub _draw {
1505 my ($self) = @_; 1782 my ($self) = @_;
1506 1783
… …
1557 if ($sym == 13) { 1834 if ($sym == 13) {
1558 unshift @{$self->{history}}, 1835 unshift @{$self->{history}},
1559 my $txt = $self->get_text; 1836 my $txt = $self->get_text;
1560 $self->{history_pointer} = -1; 1837 $self->{history_pointer} = -1;
1561 $self->{history_saveback} = ''; 1838 $self->{history_saveback} = '';
1562 $self->emit (activate => $txt); 1839 $self->_emit (activate => $txt);
1563 $self->update; 1840 $self->update;
1564 1841
1565 } elsif ($sym == CFClient::SDLK_UP) { 1842 } elsif ($sym == CFClient::SDLK_UP) {
1566 if ($self->{history_pointer} < 0) { 1843 if ($self->{history_pointer} < 0) {
1567 $self->{history_saveback} = $self->get_text; 1844 $self->{history_saveback} = $self->get_text;
… …
1583 } else { 1860 } else {
1584 $self->set_text ($self->{history_saveback}); 1861 $self->set_text ($self->{history_saveback});
1585 } 1862 }
1586 1863
1587 } else { 1864 } else {
1588 $self->SUPER::key_down ($ev); 1865 return $self->SUPER::key_down ($ev)
1866 }
1867
1589 } 1868 1
1590
1591} 1869}
1592 1870
1593############################################################################# 1871#############################################################################
1594 1872
1595package CFClient::UI::Button; 1873package CFClient::UI::Button;
… …
1604 1882
1605sub new { 1883sub new {
1606 my $class = shift; 1884 my $class = shift;
1607 1885
1608 $class->SUPER::new ( 1886 $class->SUPER::new (
1609 padding => 4, 1887 padding_x => 4,
1888 padding_y => 4,
1610 fg => [1, 1, 1], 1889 fg => [1, 1, 1],
1611 bg => [1, 1, 1, 0.2],
1612 active_fg => [0, 0, 1], 1890 active_fg => [0, 0, 1],
1613 can_hover => 1, 1891 can_hover => 1,
1614 align => 0, 1892 align => 0,
1615 valign => 0, 1893 valign => 0,
1616 can_events => 1, 1894 can_events => 1,
1617 @_ 1895 @_
1618 ) 1896 )
1619} 1897}
1620 1898
1899sub activate { }
1900
1621sub button_up { 1901sub button_up {
1622 my ($self, $ev, $x, $y) = @_; 1902 my ($self, $ev, $x, $y) = @_;
1623 1903
1904 $self->emit ("activate")
1624 if ($x >= 0 && $x < $self->{w} 1905 if $x >= 0 && $x < $self->{w}
1625 && $y >= 0 && $y < $self->{h}) { 1906 && $y >= 0 && $y < $self->{h};
1626 $self->emit ("activate"); 1907
1627 } 1908 1
1628} 1909}
1629 1910
1630sub _draw { 1911sub _draw {
1631 my ($self) = @_; 1912 my ($self) = @_;
1632 1913
… …
1661 1942
1662sub new { 1943sub new {
1663 my $class = shift; 1944 my $class = shift;
1664 1945
1665 $class->SUPER::new ( 1946 $class->SUPER::new (
1666 padding => 2, 1947 padding_x => 2,
1948 padding_y => 2,
1667 fg => [1, 1, 1], 1949 fg => [1, 1, 1],
1668 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],
1669 state => 0, 1953 state => 0,
1670 can_hover => 1, 1954 can_hover => 1,
1671 @_ 1955 @_
1672 ) 1956 )
1673} 1957}
1674 1958
1675sub size_request { 1959sub size_request {
1676 my ($self) = @_; 1960 my ($self) = @_;
1677 1961
1678 ($self->{padding} * 2 + 6) x 2 1962 (6) x 2
1679} 1963}
1680 1964
1681sub button_down { 1965sub button_down {
1682 my ($self, $ev, $x, $y) = @_; 1966 my ($self, $ev, $x, $y) = @_;
1683 1967
1684 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 1968 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1685 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 1969 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1686 $self->{state} = !$self->{state}; 1970 $self->{state} = !$self->{state};
1687 $self->emit (changed => $self->{state}); 1971 $self->_emit (changed => $self->{state});
1972 } else {
1973 return 0
1974 }
1975
1688 } 1976 1
1689} 1977}
1690 1978
1691sub _draw { 1979sub _draw {
1692 my ($self) = @_; 1980 my ($self) = @_;
1693 1981
1694 $self->SUPER::_draw; 1982 $self->SUPER::_draw;
1695 1983
1696 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 1984 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1697 1985
1698 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;
1699 1989
1700 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 1990 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1701 1991
1702 my $tex = $self->{state} ? $tex[1] : $tex[0]; 1992 my $tex = $self->{state} ? $tex[1] : $tex[0];
1703 1993
… …
1957 qw(s1_slider.png s1_slider_bg.png); 2247 qw(s1_slider.png s1_slider_bg.png);
1958 2248
1959sub new { 2249sub new {
1960 my $class = shift; 2250 my $class = shift;
1961 2251
1962 # range [value, low, high, page] 2252 # range [value, low, high, page, unit]
1963 2253
1964 # TODO: 0-width page 2254 # TODO: 0-width page
1965 # TODO: req_w/h are wrong with vertical 2255 # TODO: req_w/h are wrong with vertical
1966 # TODO: calculations are off 2256 # TODO: calculations are off
1967 my $self = $class->SUPER::new ( 2257 my $self = $class->SUPER::new (
1968 fg => [1, 1, 1], 2258 fg => [1, 1, 1],
1969 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],
1970 range => [0, 0, 100, 10], 2262 range => [0, 0, 100, 10, 0],
1971 req_w => $::WIDTH / 80, 2263 min_w => $::WIDTH / 80,
1972 req_h => $::WIDTH / 80, 2264 min_h => $::WIDTH / 80,
1973 vertical => 0, 2265 vertical => 0,
1974 can_hover => 1, 2266 can_hover => 1,
1975 inner_pad => 5, 2267 inner_pad => 0.02,
1976 @_ 2268 @_
1977 ); 2269 );
1978 2270
2271 $self->set_value ($self->{range}[0]);
2272 $self->update;
2273
1979 $self 2274 $self
1980} 2275}
1981 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
2288sub set_value {
2289 my ($self, $value) = @_;
2290
2291 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2292
2293 $hi = $lo + 1 if $hi <= $lo;
2294
2295 $page = $hi - $lo if $page > $hi - $lo;
2296
2297 $value = $lo if $value < $lo;
2298 $value = $hi - $page if $value > $hi - $page;
2299
2300 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2301 if $unit;
2302
2303 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2304
2305 if ($value != $old_value) {
2306 $self->_emit (changed => $value);
2307 $self->update;
2308 }
2309}
2310
1982sub size_request { 2311sub size_request {
1983 my ($self) = @_; 2312 my ($self) = @_;
1984 2313
1985 my $w = $self->{req_w}; 2314 ($self->{req_w}, $self->{req_h})
1986 my $h = $self->{req_h};
1987
1988 $self->{vertical} ? ($h, $w) : ($w, $h)
1989} 2315}
1990 2316
1991sub button_down { 2317sub button_down {
1992 my ($self, $ev, $x, $y) = @_; 2318 my ($self, $ev, $x, $y) = @_;
1993 2319
1994 $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
1995 $self->mouse_motion ($ev, $x, $y); 2324 $self->mouse_motion ($ev, $x, $y)
1996} 2325}
1997 2326
1998sub mouse_motion { 2327sub mouse_motion {
1999 my ($self, $ev, $x, $y) = @_; 2328 my ($self, $ev, $x, $y) = @_;
2000 2329
2001 if ($GRAB == $self) { 2330 if ($GRAB == $self) {
2331 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2332
2333 my (undef, $lo, $hi, $page) = @{$self->{range}};
2334
2335 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2336
2337 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2338 } else {
2339 return 0;
2340 }
2341
2342 1
2343}
2344
2345sub update {
2346 my ($self) = @_;
2347
2348 delete $self->{knob_w};
2349 $self->SUPER::update;
2350}
2351
2352sub _draw {
2353 my ($self) = @_;
2354
2355 unless ($self->{knob_w}) {
2356 $self->set_value ($self->{range}[0]);
2357
2002 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2358 my ($value, $lo, $hi, $page) = @{$self->{range}};
2359 my $range = ($hi - $page - $lo) || 1e-100;
2003 2360
2004 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2361 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2005 2362
2006 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2363 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2007 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 2364 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2008 2365
2009 $x -= $inner_pad_px; # substract the padding 2366 $value = ($value - $lo) / $range;
2010 $x = $x * ($hi - $lo) / $inner_w + $lo; 2367 $value = $value * $self->{scale} + $self->{offset};
2011 $x = $lo if $x < $lo;
2012 $x = $hi - $page if $x > $hi - $page;
2013 $self->{range}[0] = $x;
2014 2368
2015 $self->emit (changed => $x); 2369 $self->{knob_x} = $value - $knob_w * 0.5;
2016 $self->update; 2370 $self->{knob_w} = $knob_w;
2017 } 2371 }
2018}
2019
2020# the inner_* stuff is for generating a padding for the slider handle,
2021# so that the handle doesn't leave the texture. This calculation isn't 100%
2022# correct propably, but it does the job for now
2023sub _calc_inner_pad_px {
2024 my ($self, $w) = @_;
2025 ($w / 100) * $self->{inner_pad} # % to pixels
2026}
2027
2028sub _draw {
2029 my ($self) = @_;
2030 2372
2031 $self->SUPER::_draw (); 2373 $self->SUPER::_draw ();
2032 2374
2033 my ($w, $h) = @$self{qw(w h)}; 2375 glScale $self->{w}, $self->{h};
2034 2376
2035 if ($self->{vertical}) { 2377 if ($self->{vertical}) {
2036 # draw a vertical slider like a rotated horizontal slider 2378 # draw a vertical slider like a rotated horizontal slider
2037 2379
2380 glTranslate 1, 0, 0;
2038 glRotate 90, 0, 0, 1; 2381 glRotate 90, 0, 0, 1;
2039 glTranslate 0, -$self->{w}, 0;
2040
2041 ($w, $h) = ($h, $w);
2042 } 2382 }
2043 2383
2044 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2384 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2045 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2385 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2046 2386
2047 my ($value, $lo, $hi, $page) = @{$self->{range}};
2048
2049 $hi = $value + 1 if $lo == $hi;
2050
2051 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
2052 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
2053
2054 $page = int $page * $inner_w / ($hi - $lo);
2055 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
2056
2057 $w -= $page;
2058 $page &= ~1;
2059 glTranslate $page * 0.5, 0, 0;
2060 $page ||= 2;
2061
2062 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
2063 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
2064
2065 glEnable GL_TEXTURE_2D; 2387 glEnable GL_TEXTURE_2D;
2066 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2388 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2067 2389
2068 # draw background 2390 # draw background
2069 $tex[1]->draw_quad_alpha (0, 0, $w, $h); 2391 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2070 2392
2071 # draw handle 2393 # draw handle
2072 $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h); 2394 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2073 2395
2074 glDisable GL_TEXTURE_2D; 2396 glDisable GL_TEXTURE_2D;
2075} 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 (@_) }
2076 2439
2077############################################################################# 2440#############################################################################
2078 2441
2079package CFClient::UI::TextView; 2442package CFClient::UI::TextView;
2080 2443
… …
2110 2473
2111 $self->{fontsize} = $fontsize; 2474 $self->{fontsize} = $fontsize;
2112 $self->reflow; 2475 $self->reflow;
2113} 2476}
2114 2477
2115sub text_height {
2116 my ($self, $text) = @_;
2117
2118 my $layout = $self->{layout};
2119
2120 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2121 $layout->set_width ($self->{children}[0]{w});
2122 $layout->set_markup ($text);
2123
2124 ($layout->size)[1]
2125}
2126
2127sub reflow {
2128 my ($self) = @_;
2129
2130 $self->{need_reflow}++;
2131 $self->update;
2132}
2133
2134sub size_allocate { 2478sub size_allocate {
2135 my ($self, $w, $h) = @_; 2479 my ($self, $w, $h) = @_;
2136 2480
2137 $self->SUPER::size_allocate ($w, $h); 2481 $self->SUPER::size_allocate ($w, $h);
2138 2482
… …
2141 $self->{layout}->set_width ($self->{children}[0]{w}); 2485 $self->{layout}->set_width ($self->{children}[0]{w});
2142 2486
2143 $self->reflow; 2487 $self->reflow;
2144} 2488}
2145 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
2146sub add_paragraph { 2524sub add_paragraph {
2147 my ($self, $color, $text) = @_; 2525 my ($self, $color, $text, $indent) = @_;
2148 2526
2149 #TODO: intelligently "reformat" paragraph 2527 for my $line (split /\n/, $text) {
2150 2528 my ($w, $h) = $self->text_size ($line);
2151 my $height = $self->text_height ($text);
2152
2153 $self->{height} += $height; 2529 $self->{height} += $h;
2530 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2531 }
2154 2532
2155 push @{$self->{par}}, [$height, $color, $text];
2156
2157 $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]);
2158 $self->{children}[1]->update;
2159} 2534}
2160 2535
2161sub update { 2536sub update {
2162 my ($self) = @_; 2537 my ($self) = @_;
2163 2538
… …
2165 2540
2166 return unless $self->{h} > 0; 2541 return unless $self->{h} > 0;
2167 2542
2168 delete $self->{texture}; 2543 delete $self->{texture};
2169 2544
2170 $ROOT->on_refresh ($self, sub { 2545 $ROOT->on_post_alloc ($self, sub {
2546 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2547
2171 if (delete $self->{need_reflow}) { 2548 if (delete $self->{need_reflow}) {
2172 my $height = 0; 2549 my $height = 0;
2173 2550
2174 $height += $_->[0] = $self->text_height ($_->[2]) 2551 my $layout = $self->{layout};
2552
2553 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2554
2175 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 }
2176 2566
2177 $self->{height} = $height; 2567 $self->{height} = $height;
2178 2568
2179 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2569 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2180 2570
2181 delete $self->{texture}; 2571 delete $self->{texture};
2182 } 2572 }
2183 2573
2184 $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 {
2185 glClearColor 0, 0, 0, 0; 2575 glClearColor 0.5, 0.5, 0.5, 0;
2186 glClear GL_COLOR_BUFFER_BIT; 2576 glClear GL_COLOR_BUFFER_BIT;
2187 2577
2188 glEnable GL_TEXTURE_2D;
2189 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2190
2191 my $top = int $self->{children}[1]{range}[0]; 2578 my $top = int $self->{children}[1]{range}[0];
2192 2579
2193 my $y0 = $top; 2580 my $y0 = $top;
2194 my $y1 = $top + $self->{h}; 2581 my $y1 = $top + $H;
2195 2582
2196 my $y = 0; 2583 my $y = 0;
2197 2584
2198 my $layout = $self->{layout}; 2585 my $layout = $self->{layout};
2199 2586
2200 $layout->set_font ($self->{font}) if $self->{font}; 2587 $layout->set_font ($self->{font}) if $self->{font};
2201 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
2202 for my $par (@{$self->{par}}) { 2593 for my $par (@{$self->{par}}) {
2203 my $h = $par->[0]; 2594 my $h = $par->[1];
2204 2595
2205 if ($y0 < $y + $h && $y < $y1) { 2596 if ($y0 < $y + $h && $y < $y1) {
2206 $layout->set_foreground (@{ $par->[1] }); 2597 $layout->set_foreground (@{ $par->[2] });
2598 $layout->set_width ($W - $par->[3]);
2207 $layout->set_markup ($par->[2]); 2599 $layout->set_markup ($par->[4]);
2208 2600
2209 my ($W, $H) = $layout->size; 2601 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2210 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;
2211 } 2605 }
2212 2606
2213 $y += $h; 2607 $y += $h;
2214 } 2608 }
2215 2609
2216 glDisable GL_TEXTURE_2D; 2610 glDisable GL_BLEND;
2217 }; 2611 };
2218 }); 2612 });
2219} 2613}
2220 2614
2221sub _draw { 2615sub _draw {
2222 my ($self) = @_; 2616 my ($self) = @_;
2223 2617
2224 glEnable GL_TEXTURE_2D; 2618 glEnable GL_TEXTURE_2D;
2225 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2619 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2226 glColor 1, 1, 1, 1; 2620 glColor 1, 1, 1, 1;
2227 $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});
2228 glDisable GL_TEXTURE_2D; 2622 glDisable GL_TEXTURE_2D;
2229 2623
2230 $self->{children}[1]->draw; 2624 $self->{children}[1]->draw;
2231 2625
2232} 2626}
… …
2281 2675
2282sub new { 2676sub new {
2283 my $class = shift; 2677 my $class = shift;
2284 2678
2285 my $self = $class->SUPER::new ( 2679 my $self = $class->SUPER::new (
2286 state => 0, 2680 state => 0,
2287 connect_activate => \&toggle_flopper, 2681 on_activate => \&toggle_flopper,
2288 @_ 2682 @_
2289 ); 2683 );
2290 2684
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2685 $self
2297} 2686}
2298 2687
2299sub toggle_flopper { 2688sub toggle_flopper {
2300 my ($self) = @_; 2689 my ($self) = @_;
2301 2690
2302 # TODO: use animation 2691 $self->{other}->toggle_visibility;
2303 if ($self->{state} = !$self->{state}) {
2304 $CFClient::UI::ROOT->add ($self->{other});
2305 $self->{other}->move ($self->coord2global (0, $self->{h}));
2306 $self->emit ("open");
2307 } else {
2308 $CFClient::UI::ROOT->remove ($self->{other});
2309 $self->emit ("close");
2310 }
2311
2312 $self->emit (changed => $self->{state});
2313} 2692}
2314 2693
2315############################################################################# 2694#############################################################################
2316 2695
2317package CFClient::UI::Tooltip; 2696package CFClient::UI::Tooltip;
… …
2330} 2709}
2331 2710
2332sub set_tooltip_from { 2711sub set_tooltip_from {
2333 my ($self, $widget) = @_; 2712 my ($self, $widget) = @_;
2334 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
2335 $self->add (new CFClient::UI::Label 2723 $self->add (new CFClient::UI::Label
2336 markup => $widget->{tooltip}, 2724 markup => $tooltip,
2337 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2725 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2338 fontsize => 0.8, 2726 fontsize => 0.8,
2339 fg => [0, 0, 0, 1], 2727 fg => [0, 0, 0, 1],
2728 ellipsise => 0,
2340 font => ($widget->{tooltip_font} || $::FONT_PROP), 2729 font => ($widget->{tooltip_font} || $::FONT_PROP),
2341 ); 2730 );
2342} 2731}
2343 2732
2344sub size_request { 2733sub size_request {
2345 my ($self) = @_; 2734 my ($self) = @_;
… …
2351 2740
2352sub size_allocate { 2741sub size_allocate {
2353 my ($self, $w, $h) = @_; 2742 my ($self, $w, $h) = @_;
2354 2743
2355 $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 });
2356} 2763}
2357 2764
2358sub _draw { 2765sub _draw {
2359 my ($self) = @_; 2766 my ($self) = @_;
2360 2767
… …
2377 glVertex $w, $h; 2784 glVertex $w, $h;
2378 glVertex $w, 0; 2785 glVertex $w, 0;
2379 glEnd; 2786 glEnd;
2380 2787
2381 glTranslate 2 - 0.375, 2 - 0.375; 2788 glTranslate 2 - 0.375, 2 - 0.375;
2789
2382 $self->SUPER::_draw; 2790 $self->SUPER::_draw;
2383} 2791}
2384 2792
2385############################################################################# 2793#############################################################################
2386 2794
… …
2391use CFClient::OpenGL; 2799use CFClient::OpenGL;
2392 2800
2393sub new { 2801sub new {
2394 my $class = shift; 2802 my $class = shift;
2395 2803
2396 $class->SUPER::new ( 2804 my $self = $class->SUPER::new (
2397 aspect => 1, 2805 aspect => 1,
2806 can_events => 0,
2398 @_, 2807 @_,
2399 ) 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
2400} 2825}
2401 2826
2402sub size_request { 2827sub size_request {
2403 (32, 8) 2828 (32, 8)
2404} 2829}
2405 2830
2831sub update {
2832 my ($self) = @_;
2833
2834 return unless $self->{visible};
2835
2836 $self->SUPER::update;
2837}
2838
2406sub _draw { 2839sub _draw {
2407 my ($self) = @_; 2840 my ($self) = @_;
2408 2841
2409 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
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2853 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 2854
2412 # TODO animation
2413 if ($tex) { 2855 if ($tex) {
2414 glEnable GL_TEXTURE_2D; 2856 glEnable GL_TEXTURE_2D;
2415 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2857 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416 glColor 1, 1, 1, 1; 2858 glColor 1, 1, 1, 1;
2417 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2859 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2418 glDisable GL_TEXTURE_2D; 2860 glDisable GL_TEXTURE_2D;
2419 } 2861 }
2420} 2862}
2421 2863
2864sub DESTROY {
2865 my ($self) = @_;
2866
2867 $self->{timer}->cancel
2868 if $self->{timer};
2869
2870 $self->SUPER::DESTROY;
2871}
2872
2422############################################################################# 2873#############################################################################
2423 2874
2424package CFClient::UI::InventoryItem; 2875package CFClient::UI::Buttonbar;
2425 2876
2426our @ISA = CFClient::UI::HBox::; 2877our @ISA = CFClient::UI::HBox::;
2427 2878
2428sub new { 2879# TODO: should actualyl wrap buttons and other goodies.
2429 my $class = shift;
2430
2431 my %args = @_;
2432
2433 my $item = delete $args{item};
2434
2435 my $desc = $item->{nrof} < 2
2436 ? $item->{name}
2437 : "$item->{nrof} $item->{name_pl}";
2438
2439
2440 my $self = $class->SUPER::new (
2441 can_hover => 1,
2442 can_events => 1,
2443 tooltip => (CFClient::UI::Label->escape ($desc)
2444 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2445 connect_button_down => sub {
2446 my ($self, $ev, $x, $y) = @_;
2447
2448 # todo: maybe put examine on 1? but should just be a tooltip :(
2449 if ($ev->{button} == 1) {
2450 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2451 } elsif ($ev->{button} == 2) {
2452 $::CONN->send ("apply $item->{tag}");
2453 } elsif ($ev->{button} == 3) {
2454 CFClient::UI::Menu->new (
2455 items => [
2456 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2457 [
2458 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2459 sub { $::CONN->send ("lock $item->{tag}") },
2460 ],
2461 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2462 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2463 ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
2464 ],
2465 )->popup ($ev);
2466 }
2467
2468 1
2469 },
2470 %args
2471 );
2472
2473 $self->add (new CFClient::UI::Face
2474 can_events => 0,
2475 face => $item->{face},
2476 anim => $item->{anim},
2477 animspeed => $item->{animspeed},
2478 );
2479
2480 $self->add (new CFClient::UI::Label
2481 can_events => 0,
2482 text => $desc,
2483 );
2484
2485 $self
2486}
2487
2488#############################################################################
2489
2490package CFClient::UI::Inventory;
2491
2492our @ISA = CFClient::UI::ScrolledWindow::;
2493
2494sub new {
2495 my $class = shift;
2496
2497 my $self = $class->SUPER::new (
2498 scrolled => (new CFClient::UI::VBox),
2499 @_,
2500 );
2501
2502 $self
2503}
2504
2505sub set_items {
2506 my ($self, $items) = @_;
2507
2508 $self->{scrolled}->clear;
2509 return unless $items;
2510
2511 my @items = sort { $a->{type} <=> $b->{type} } @$items;
2512
2513 $self->{real_items} = \@items;
2514
2515 for my $item (@items) {
2516 my $desc = $item->{nrof} < 2
2517 ? $item->{name}
2518 : "$item->{nrof} $item->{name_pl}";
2519
2520 $self->{scrolled}->add ($item->{widget} ||= new CFClient::UI::InventoryItem item => $item);
2521 }
2522
2523# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2524}
2525
2526sub size_request {
2527 my ($self) = @_;
2528 ($self->{req_w}, $self->{req_h});
2529}
2530 2880
2531############################################################################# 2881#############################################################################
2532 2882
2533package CFClient::UI::Menu; 2883package CFClient::UI::Menu;
2534 2884
… …
2568 2918
2569# 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)
2570sub popup { 2920sub popup {
2571 my ($self, $ev) = @_; 2921 my ($self, $ev) = @_;
2572 2922
2573 $self->emit ("popdown"); 2923 $self->_emit ("popdown");
2574 2924
2575 # maybe save $GRAB? must be careful about events... 2925 # maybe save $GRAB? must be careful about events...
2576 $GRAB = $self; 2926 $GRAB = $self;
2577 $self->{button} = $ev->{button}; 2927 $self->{button} = $ev->{button};
2578 2928
2579 $self->show; 2929 $self->show;
2580 $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);
2581} 2931}
2582 2932
2583sub mouse_motion { 2933sub mouse_motion {
2584 my ($self, $ev, $x, $y) = @_; 2934 my ($self, $ev, $x, $y) = @_;
2585 2935
2586 # TODO: should use vbox->find_widget or so 2936 # TODO: should use vbox->find_widget or so
2587 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2937 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2588 $self->{hover} = $self->{item}{$HOVER}; 2938 $self->{hover} = $self->{item}{$HOVER};
2939
2940 0
2589} 2941}
2590 2942
2591sub button_up { 2943sub button_up {
2592 my ($self, $ev, $x, $y) = @_; 2944 my ($self, $ev, $x, $y) = @_;
2593 2945
2594 if ($ev->{button} == $self->{button}) { 2946 if ($ev->{button} == $self->{button}) {
2595 undef $GRAB; 2947 undef $GRAB;
2596 $self->hide; 2948 $self->hide;
2597 2949
2598 $self->emit ("popdown"); 2950 $self->_emit ("popdown");
2599 $self->{hover}[1]->() if $self->{hover}; 2951 $self->{hover}[1]->() if $self->{hover};
2952 } else {
2953 return 0
2954 }
2955
2600 } 2956 1
2601} 2957}
2602 2958
2603############################################################################# 2959#############################################################################
2604 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
2605package CFClient::UI::Statusbox; 3069package CFClient::UI::Statusbox;
2606 3070
2607our @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}
2608 3081
2609sub reorder { 3082sub reorder {
2610 my ($self) = @_; 3083 my ($self) = @_;
2611 my $NOW = time; 3084 my $NOW = time;
2612 3085
… …
2631 ? "<b>$item->{count} ×</b> $item->{text}" 3104 ? "<b>$item->{count} ×</b> $item->{text}"
2632 : $item->{text}; 3105 : $item->{text};
2633 3106
2634 for ($short) { 3107 for ($short) {
2635 s/^\s+//; 3108 s/^\s+//;
2636 s/\012.*/…/s; 3109 s/\s+/ /g;
2637 my $len = int 30 / $item->{fontsize};
2638 substr $_, $len, length, "…" if $len < length;
2639 } 3110 }
2640 3111
2641 new CFClient::UI::Label 3112 new CFClient::UI::Label
2642 markup => $short, 3113 markup => $short,
2643 tooltip => $item->{tooltip}, 3114 tooltip => $item->{tooltip},
2644 tooltip_font => $::FONT_PROP, 3115 tooltip_font => $::FONT_PROP,
2645 tooltip_width => 0.67, 3116 tooltip_width => 0.67,
2646 fontsize => $item->{fontsize}, 3117 fontsize => $item->{fontsize} || $self->{fontsize},
3118 max_w => $::WIDTH * 0.44,
2647 color => $item->{color}, 3119 fg => $item->{fg},
2648 can_events => 1, 3120 can_events => 1,
2649 can_hover => 1 3121 can_hover => 1
2650 }; 3122 };
2651 } 3123 }
2652 3124
… …
2654 $self->SUPER::add (reverse @widgets); 3126 $self->SUPER::add (reverse @widgets);
2655} 3127}
2656 3128
2657sub add { 3129sub add {
2658 my ($self, $text, %arg) = @_; 3130 my ($self, $text, %arg) = @_;
3131
3132 $text =~ s/^\s+//;
3133 $text =~ s/\s+$//;
3134
3135 return unless $text;
2659 3136
2660 my $timeout = time + ((delete $arg{timeout}) || 60); 3137 my $timeout = time + ((delete $arg{timeout}) || 60);
2661 3138
2662 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3139 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2663 3140
… …
2666 $item->{count}++; 3143 $item->{count}++;
2667 } else { 3144 } else {
2668 $item->{count} = 1; 3145 $item->{count} = 1;
2669 $item->{text} = $item->{tooltip} = $text; 3146 $item->{text} = $item->{tooltip} = $text;
2670 } 3147 }
3148 $item->{id} = ++$self->{id};
2671 $item->{timeout} = $timeout; 3149 $item->{timeout} = $timeout;
2672 delete $item->{label}; 3150 delete $item->{label};
2673 } else { 3151 } else {
2674 $self->{item}{$group} = { 3152 $self->{item}{$group} = {
2675 id => ++$self->{id}, 3153 id => ++$self->{id},
2676 text => $text, 3154 text => $text,
2677 timeout => $timeout, 3155 timeout => $timeout,
2678 tooltip => $text, 3156 tooltip => $text,
2679 fontsize => 0.8,
2680 color => [0.8, 0.8, 0.8, 0.8], 3157 fg => [0.8, 0.8, 0.8, 0.8],
2681 pri => 0, 3158 pri => 0,
2682 count => 1, 3159 count => 1,
2683 %arg, 3160 %arg,
2684 }; 3161 };
2685 } 3162 }
2686 3163
2687 $self->reorder; 3164 $self->reorder;
2688} 3165}
2689 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
2690############################################################################# 3177#############################################################################
2691 3178
2692package CFClient::UI::Root; 3179package CFClient::UI::Inventory;
2693 3180
2694our @ISA = CFClient::UI::Container::; 3181our @ISA = CFClient::UI::ScrolledWindow::;
2695
2696use CFClient::OpenGL;
2697 3182
2698sub new { 3183sub new {
2699 my $class = shift; 3184 my $class = shift;
2700 3185
2701 $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 => [],
2702 @_, 3428 @_,
2703 ) 3429 )
2704} 3430}
2705 3431
2706sub configure { 3432# XXX: Do sorting? Argl...
2707 my ($self, $x, $y, $w, $h) = @_; 3433sub add_spell {
2708
2709 $self->{w} = $w;
2710 $self->{h} = $h;
2711}
2712
2713sub check_size {
2714 my ($self) = @_; 3434 my ($self, $spell) = @_;
3435 $self->{spells}->{$spell->{name}} = $spell;
2715 3436
2716 $self->size_allocate ($self->{w}, $self->{h}) 3437 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2717 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
2718} 3491}
2719 3492
2720sub size_request { 3493sub size_request {
2721 my ($self) = @_; 3494 my ($self) = @_;
2722 3495
2723 ($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
2724} 3511}
2725 3512
2726sub size_allocate { 3513sub size_allocate {
2727 my ($self, $w, $h) = @_; 3514 my ($self, $w, $h) = @_;
2728 3515
2729 my $old_w = $self->{old_w};
2730 my $old_h = $self->{old_h};
2731
2732 if ($old_w && $old_h) {
2733 for my $child ($self->children) {
2734 $child->{x} = int 0.5 + $child->{x} * $w / $old_w;
2735 $child->{w} = int 0.5 + $child->{w} * $w / $old_w;
2736 $child->{req_w} = int 0.5 + $child->{req_w} * $w / $old_w if exists $child->{req_w};
2737 $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
2738 $child->{y} = int 0.5 + $child->{y} * $h / $old_h;
2739 $child->{h} = int 0.5 + $child->{h} * $h / $old_h;
2740 $child->{req_h} = int 0.5 + $child->{req_h} * $h / $old_h if exists $child->{req_h};
2741 $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
2742 }
2743 }
2744
2745 for my $child ($self->children) { 3516 for my $child ($self->children) {
2746 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)};
2747 3518
2748 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3519 $X = $child->{force_x} if exists $child->{force_x};
2749 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3520 $Y = $child->{force_y} if exists $child->{force_y};
3521
3522 $X = _to_pixel $X, $W, $self->{w};
3523 $Y = _to_pixel $Y, $H, $self->{h};
3524
2750 $child->configure ($X, $Y, $W, $H); 3525 $child->configure ($X, $Y, $W, $H);
2751 } 3526 }
2752
2753 $self->{old_w} = $w;
2754 $self->{old_h} = $h;
2755} 3527}
2756 3528
2757sub coord2local { 3529sub coord2local {
2758 my ($self, $x, $y) = @_; 3530 my ($self, $x, $y) = @_;
2759 3531
… …
2767} 3539}
2768 3540
2769sub update { 3541sub update {
2770 my ($self) = @_; 3542 my ($self) = @_;
2771 3543
2772 $self->check_size;
2773 $::WANT_REFRESH++; 3544 $::WANT_REFRESH++;
2774} 3545}
2775 3546
2776sub add { 3547sub add {
2777 my ($self, $child) = @_; 3548 my ($self, @children) = @_;
2778 3549
2779 # integerise window positions 3550 $_->{is_toplevel} = 1
2780 $child->{x} = int $child->{x}; 3551 for @children;
2781 $child->{y} = int $child->{y};
2782 3552
2783 $self->SUPER::add ($child); 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 }
2784} 3569}
2785 3570
2786sub on_refresh { 3571sub on_refresh {
2787 my ($self, $id, $cb) = @_; 3572 my ($self, $id, $cb) = @_;
2788 3573
2789 $self->{refresh_hook}{$id} = $cb; 3574 $self->{refresh_hook}{$id} = $cb;
2790} 3575}
2791 3576
3577sub on_post_alloc {
3578 my ($self, $id, $cb) = @_;
3579
3580 $self->{post_alloc_hook}{$id} = $cb;
3581}
3582
2792sub draw { 3583sub draw {
2793 my ($self) = @_; 3584 my ($self) = @_;
2794
2795 if ($self->{check_size}) {
2796 my @queue = ([], []);
2797
2798 for (;;) {
2799 if ($self->{check_size}) {
2800 # heuristic: check containers last
2801 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
2802 for values %{delete $self->{check_size}}
2803 }
2804
2805 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
2806
2807 my ($w, $h) = $widget->{user_w} && $widget->{user_h}
2808 ? @$widget{qw(user_w user_h)}
2809 : $widget->size_request;
2810
2811 if (delete $widget->{force_alloc}
2812 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2813 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2814
2815 $widget->{req_w} = $w;
2816 $widget->{req_h} = $h;
2817
2818 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
2819
2820 $widget->{parent}->check_size
2821 if $widget->{parent};
2822 }
2823 }
2824 }
2825
2826 while ($self->{size_alloc}) {
2827 for (values %{delete $self->{size_alloc}}) {
2828 my ($widget, $w, $h) = @$_;
2829
2830 $w = 0 if $w < 0;
2831 $h = 0 if $h < 0;
2832
2833 $widget->{w} = $w;
2834 $widget->{h} = $h;
2835 $widget->size_allocate ($w, $h);
2836 $widget->emit (size_allocate => $w, $h);
2837 }
2838 }
2839 3585
2840 while ($self->{refresh_hook}) { 3586 while ($self->{refresh_hook}) {
2841 $_->() 3587 $_->()
2842 for values %{delete $self->{refresh_hook}}; 3588 for values %{delete $self->{refresh_hook}};
2843 } 3589 }
2844 3590
3591 if ($self->{realloc}) {
3592 my %queue;
3593 my @queue;
3594 my $widget;
3595
3596 outer:
3597 while () {
3598 if (my $realloc = delete $self->{realloc}) {
3599 for $widget (values %$realloc) {
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 }
3606 }
3607
3608 while () {
3609 @queue or last outer;
3610
3611 $widget = pop @{ $queue[-1] || [] }
3612 and last;
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}) {
3629 $widget->{req_w} = $w;
3630 $widget->{req_h} = $h;
3631
3632 $self->{size_alloc}{$widget+0} = $widget;
3633
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 }
3641 }
3642
3643 delete $self->{realloc}{$widget+0};
3644 }
3645 }
3646
3647 while (my $size_alloc = delete $self->{size_alloc}) {
3648 my @queue = sort { $b->{visible} <=> $a->{visible} }
3649 values %$size_alloc;
3650
3651 while () {
3652 my $widget = pop @queue || last;
3653
3654 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3655
3656 $w = 0 if $w < 0;
3657 $h = 0 if $h < 0;
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
3666 $widget->{w} = $w;
3667 $widget->{h} = $h;
3668
3669 $widget->emit (size_allocate => $w, $h);
3670 }
3671 }
3672 }
3673
3674 while ($self->{post_alloc_hook}) {
3675 $_->()
3676 for values %{delete $self->{post_alloc_hook}};
3677 }
3678
3679
2845 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3680 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2846 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3681 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2847 glClear GL_COLOR_BUFFER_BIT; 3682 glClear GL_COLOR_BUFFER_BIT;
2848 3683
2849 glMatrixMode GL_PROJECTION; 3684 glMatrixMode GL_PROJECTION;
2850 glLoadIdentity; 3685 glLoadIdentity;
2851 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3686 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2852 glMatrixMode GL_MODELVIEW; 3687 glMatrixMode GL_MODELVIEW;
2853 glLoadIdentity; 3688 glLoadIdentity;
2854 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
2855 $self->_draw; 3697 $self->_draw;
2856} 3698}
2857 3699
2858############################################################################# 3700#############################################################################
2859 3701
2860package CFClient::UI; 3702package CFClient::UI;
2861 3703
2862$ROOT = new CFClient::UI::Root; 3704$ROOT = new CFClient::UI::Root;
2863$TOOLTIP = new CFClient::UI::Tooltip; 3705$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2864 3706
28651 37071
2866 3708

Diff Legend

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