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.272 by root, Sat Jun 3 01:47:14 2006 UTC

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

Diff Legend

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