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

Diff Legend

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