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.194 by root, Thu May 11 23:41:47 2006 UTC vs.
Revision 1.277 by root, Sun Jun 4 00:21:52 2006 UTC

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

Diff Legend

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