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.273 by root, Sat Jun 3 02:32:35 2006 UTC

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

Diff Legend

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