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

Diff Legend

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