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.208 by root, Mon May 15 22:52:17 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 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 61 }
43 62
44 return; 63 return;
45 } 64 }
46 } 65 }
… …
50 delete $TOOLTIP->{owner}; 69 delete $TOOLTIP->{owner};
51} 70}
52 71
53# class methods for events 72# class methods for events
54sub feed_sdl_key_down_event { 73sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 74 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 75 if $FOCUS;
57} 76}
58 77
59sub feed_sdl_key_up_event { 78sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 79 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 80 if $FOCUS;
62} 81}
63 82
64sub feed_sdl_button_down_event { 83sub feed_sdl_button_down_event {
65 my ($ev) = @_; 84 my ($ev) = @_;
… …
74 check_tooltip; 93 check_tooltip;
75 } 94 }
76 95
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 96 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 97
79 if ($GRAB) { 98 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 99 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 100}
84 101
85sub feed_sdl_button_up_event { 102sub feed_sdl_button_up_event {
86 my ($ev) = @_; 103 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 104 my ($x, $y) = ($ev->{x}, $ev->{y});
88 105
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 106 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 107
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 108 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 109
93 if ($GRAB) { 110 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 111 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 112
98 if (!$BUTTON_STATE) { 113 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 114 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 115 $grab->update if $grab;
101 $GRAB->update if $GRAB; 116 $GRAB->update if $GRAB;
… …
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 132 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 133
119 check_tooltip; 134 check_tooltip;
120 } 135 }
121 136
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 137 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 138 if $HOVER;
126} 139}
127 140
128# convert position array to integers 141# convert position array to integers
129sub harmonize { 142sub harmonize {
130 my ($vals) = @_; 143 my ($vals) = @_;
… …
136 $rem += $_ - $i; 149 $rem += $_ - $i;
137 $_ = $i; 150 $_ = $i;
138 } 151 }
139} 152}
140 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
141# call when resolution changes etc. 170# call when resolution changes etc.
142sub rescale_widgets { 171sub rescale_widgets {
143 my ($sx, $sy) = @_; 172 my ($sx, $sy) = @_;
144 173
145 for my $widget (values %WIDGET) { 174 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $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.]+$/;
152 $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};
153 $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};
154 $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
155 } 189 }
156
157 $widget->reconfigure;
158 } 190 }
191
192 reconfigure_widgets;
159} 193}
160 194
161############################################################################# 195#############################################################################
162 196
163package CFClient::UI::Base; 197package CFClient::UI::Base;
… …
168 202
169sub new { 203sub new {
170 my $class = shift; 204 my $class = shift;
171 205
172 my $self = bless { 206 my $self = bless {
173 x => 0, 207 x => "center",
174 y => 0, 208 y => "center",
175 z => 0, 209 z => 0,
210 w => undef,
211 h => undef,
176 can_events => 1, 212 can_events => 1,
177 @_ 213 @_
178 }, $class; 214 }, $class;
179 215
216 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
217
180 for (keys %$self) { 218 for (keys %$self) {
181 if (/^connect_(.*)$/) { 219 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 220 $self->connect ($1 => delete $self->{$_});
183 } 221 }
184 } 222 }
185 223
186 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 }
187 235
188 $self 236 $self
189} 237}
190 238
191sub destroy { 239sub destroy {
… …
201 return if $self->{parent}; 249 return if $self->{parent};
202 250
203 $CFClient::UI::ROOT->add ($self); 251 $CFClient::UI::ROOT->add ($self);
204} 252}
205 253
206sub hide { 254sub set_visible {
207 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};
208 278
209 undef $GRAB if $GRAB == $self; 279 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 280 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
… …
239 339
240sub configure { 340sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 341 my ($self, $x, $y, $w, $h) = @_;
242 342
243 if ($self->{aspect}) { 343 if ($self->{aspect}) {
344 my ($ow, $oh) = ($w, $h);
345
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 346 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 347 $h = List::Util::min $h, int $w / $self->{aspect};
246 348
247 # use alignment to adjust x, y 349 # use alignment to adjust x, y
248 350
249 $x += int +($w - $w2) * 0.5; 351 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 352 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 353 }
254 354
255 if ($self->{x} != $x || $self->{y} != $y) { 355 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 356 $self->{x} = $x;
257 $self->{y} = $y; 357 $self->{y} = $y;
258 $self->update; 358 $self->update;
259 } 359 }
260 360
261 if ($self->{w} != $w || $self->{h} != $h) { 361 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $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;
263 } 368 }
264} 369}
265 370
266sub size_allocate { 371sub size_allocate {
267 # nothing to be done 372 # nothing to be done
268} 373}
269 374
270sub reconfigure {
271 my ($self) = @_;
272
273 $self->check_size (1);
274 $self->update;
275}
276
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 delete $self->{max_w}; $self->{max_w} = $w if $w;
284 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 }
285} 404}
286 405
287# translate global coordinates to local coordinate system 406# translate global coordinates to local coordinate system
288sub coord2local { 407sub coord2local {
289 my ($self, $x, $y) = @_; 408 my ($self, $x, $y) = @_;
… …
304 return if $FOCUS == $self; 423 return if $FOCUS == $self;
305 return unless $self->{can_focus}; 424 return unless $self->{can_focus};
306 425
307 my $focus = $FOCUS; $FOCUS = $self; 426 my $focus = $FOCUS; $FOCUS = $self;
308 427
309 $self->emit (focus_in => $focus); 428 $self->_emit (focus_in => $focus);
310 429
311 $focus->update if $focus; 430 $focus->update if $focus;
312 $FOCUS->update; 431 $FOCUS->update;
313} 432}
314 433
… …
317 436
318 return unless $FOCUS == $self; 437 return unless $FOCUS == $self;
319 438
320 my $focus = $FOCUS; undef $FOCUS; 439 my $focus = $FOCUS; undef $FOCUS;
321 440
322 $self->emit (focus_out => $focus); 441 $self->_emit (focus_out => $focus);
323 442
324 $focus->update if $focus; #? 443 $focus->update if $focus; #?
325}
326 444
445 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447}
448
327sub mouse_motion { } 449sub mouse_motion { 0 }
328sub button_up { } 450sub button_up { 0 }
329sub key_down { } 451sub key_down { 0 }
330sub key_up { } 452sub key_up { 0 }
331 453
332sub button_down { 454sub button_down {
333 my ($self, $ev, $x, $y) = @_; 455 my ($self, $ev, $x, $y) = @_;
334 456
335 $self->focus_in; 457 $self->focus_in;
336}
337 458
338sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 459 0
339sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 460}
340sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 461
341sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 462sub find_widget {
342sub 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
343 535
344sub draw { 536sub draw {
345 my ($self) = @_; 537 my ($self) = @_;
346 538
347 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);
348 550
349 glPushMatrix; 551 glPushMatrix;
350 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
351 $self->_draw;
352 glPopMatrix;
353 553
354 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
355 my ($x, $y) = @$self{qw(x y)};
356
357 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
358 glEnable GL_BLEND; 556 glEnable GL_BLEND;
359 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
360 glBegin GL_QUADS; 558 glBegin GL_QUADS;
361 glVertex $x , $y;
362 glVertex $x + $self->{w}, $y;
363 glVertex $x + $self->{w}, $y + $self->{h};
364 glVertex $x , $y + $self->{h};
365 glEnd;
366 glDisable GL_BLEND;
367 }
368
369 if ($ENV{PCLIENT_DEBUG}) {
370 glPushMatrix;
371 glColor 1, 1, 0, 1;
372 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
373 glBegin GL_LINE_LOOP;
374 glVertex 0 , 0; 559 glVertex 0 , 0;
375 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
376 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
377 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
378 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;
379 glPopMatrix; 577 glPopMatrix;
380 #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;
381 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
382} 583}
383 584
384sub _draw { 585sub _draw {
385 my ($self) = @_; 586 my ($self) = @_;
386 587
387 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
388}
389
390sub find_widget {
391 my ($self, $x, $y) = @_;
392
393 return () unless $self->{can_events};
394
395 return $self
396 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
397 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
398
399 ()
400}
401
402sub set_parent {
403 my ($self, $parent) = @_;
404
405 Scalar::Util::weaken ($self->{parent} = $parent);
406
407 # TODO: req_w _does_change after ->reconfigure
408 $self->check_size
409 unless exists $self->{req_w};
410}
411
412sub check_size {
413 my ($self, $forced) = @_;
414
415 $self->{force_alloc} = 1 if $forced;
416 $CFClient::UI::ROOT->{check_size}{$self} = $self;
417}
418
419sub update {
420 my ($self) = @_;
421
422 $self->{parent}->update
423 if $self->{parent};
424}
425
426sub connect {
427 my ($self, $signal, $cb) = @_;
428
429 push @{ $self->{signal_cb}{$signal} }, $cb;
430}
431
432sub emit {
433 my ($self, $signal, @args) = @_;
434
435 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
436} 589}
437 590
438sub DESTROY { 591sub DESTROY {
439 my ($self) = @_; 592 my ($self) = @_;
440 593
… …
455 my $class = shift; 608 my $class = shift;
456 609
457 # range [value, low, high, page] 610 # range [value, low, high, page]
458 611
459 $class->SUPER::new ( 612 $class->SUPER::new (
460 bg => [0, 0, 0, 0.2], 613 #bg => [0, 0, 0, 0.2],
461 active_bg => [1, 1, 1, 0.5], 614 #active_bg => [1, 1, 1, 0.5],
462 @_ 615 @_
463 ) 616 )
464} 617}
465 618
466sub _draw { 619sub _draw {
467 my ($self) = @_; 620 my ($self) = @_;
468 621
622 my $color = $FOCUS == $self && $self->{active_bg}
623 ? $self->{active_bg}
624 : $self->{bg};
625
626 if ($color && (@$color < 4 || $color->[3])) {
469 my ($w, $h) = @$self{qw(w h)}; 627 my ($w, $h) = @$self{qw(w h)};
470 628
471 glEnable GL_BLEND; 629 glEnable GL_BLEND;
472 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 630 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
473 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} }; 631 glColor_premultiply @$color;
474 632
475 glBegin GL_QUADS; 633 glBegin GL_QUADS;
476 glVertex 0 , 0; 634 glVertex 0 , 0;
477 glVertex 0 , $h; 635 glVertex 0 , $h;
478 glVertex $w, $h; 636 glVertex $w, $h;
479 glVertex $w, 0; 637 glVertex $w, 0;
480 glEnd; 638 glEnd;
481 639
482 glDisable GL_BLEND; 640 glDisable GL_BLEND;
641 }
483} 642}
484 643
485############################################################################# 644#############################################################################
486 645
487package CFClient::UI::Empty; 646package CFClient::UI::Empty;
… …
492 my ($class, %arg) = @_; 651 my ($class, %arg) = @_;
493 $class->SUPER::new (can_events => 0, %arg); 652 $class->SUPER::new (can_events => 0, %arg);
494} 653}
495 654
496sub size_request { 655sub size_request {
497 (0, 0) 656 my ($self) = @_;
657
658 ($self->{w} + 0, $self->{h} + 0)
498} 659}
499 660
500sub draw { } 661sub draw { }
501 662
502############################################################################# 663#############################################################################
… …
506our @ISA = CFClient::UI::Base::; 667our @ISA = CFClient::UI::Base::;
507 668
508sub new { 669sub new {
509 my ($class, %arg) = @_; 670 my ($class, %arg) = @_;
510 671
511 my $children = delete $arg{children} || []; 672 my $children = delete $arg{children};
512 673
513 my $self = $class->SUPER::new ( 674 my $self = $class->SUPER::new (
514 children => [], 675 children => [],
515 can_events => 0, 676 can_events => 0,
516 %arg, 677 %arg,
517 ); 678 );
679
518 $self->add ($_) for @$children; 680 $self->add (@$children)
681 if $children;
519 682
520 $self 683 $self
521} 684}
522 685
523sub add { 686sub add {
… …
531 $self->{children} = [ 694 $self->{children} = [
532 sort { $a->{z} <=> $b->{z} } 695 sort { $a->{z} <=> $b->{z} }
533 @{$self->{children}}, @widgets 696 @{$self->{children}}, @widgets
534 ]; 697 ];
535 698
536 $self->check_size (1); 699 $self->realloc;
537 $self->update;
538} 700}
539 701
540sub children { 702sub children {
541 @{ $_[0]{children} } 703 @{ $_[0]{children} }
542} 704}
… …
547 delete $child->{parent}; 709 delete $child->{parent};
548 $child->hide; 710 $child->hide;
549 711
550 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 712 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
551 713
552 $self->check_size; 714 $self->realloc;
553 $self->update;
554} 715}
555 716
556sub clear { 717sub clear {
557 my ($self) = @_; 718 my ($self) = @_;
558 719
… …
562 for (@$children) { 723 for (@$children) {
563 delete $_->{parent}; 724 delete $_->{parent};
564 $_->hide; 725 $_->hide;
565 } 726 }
566 727
567 $self->check_size; 728 $self->realloc;
568 $self->update;
569} 729}
570 730
571sub find_widget { 731sub find_widget {
572 my ($self, $x, $y) = @_; 732 my ($self, $x, $y) = @_;
573 733
574 $x -= $self->{x}; 734 $x -= $self->{x};
575 $y -= $self->{y}; 735 $y -= $self->{y};
576 736
577 my $res; 737 my $res;
578 738
579 for (reverse @{ $self->{children} }) { 739 for (reverse $self->visible_children) {
580 $res = $_->find_widget ($x, $y) 740 $res = $_->find_widget ($x, $y)
581 and return $res; 741 and return $res;
582 } 742 }
583 743
584 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 744 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633 $self->{children}[0]->configure (0, 0, $w, $h); 793 $self->{children}[0]->configure (0, 0, $w, $h);
634} 794}
635 795
636############################################################################# 796#############################################################################
637 797
798# back-buffered drawing area
799
638package CFClient::UI::Window; 800package CFClient::UI::Window;
639 801
640our @ISA = CFClient::UI::Bin::; 802our @ISA = CFClient::UI::Bin::;
641 803
642use CFClient::OpenGL; 804use CFClient::OpenGL;
… …
660 $self->SUPER::size_allocate ($w, $h); 822 $self->SUPER::size_allocate ($w, $h);
661 $self->update; 823 $self->update;
662} 824}
663 825
664sub _render { 826sub _render {
827 my ($self) = @_;
828
665 $_[0]{children}[0]->draw; 829 $self->{children}[0]->draw;
666} 830}
667 831
668sub render_child { 832sub render_child {
669 my ($self) = @_; 833 my ($self) = @_;
670 834
671 $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 {
672 glClearColor 0, 0, 0, 0; 836 glClearColor 0, 0, 0, 0;
673 glClear GL_COLOR_BUFFER_BIT; 837 glClear GL_COLOR_BUFFER_BIT;
674 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
675 $self->_render; 846 $self->_render;
676# glColorMask 1, 1, 1, 0;
677# glEnable GL_BLEND;
678# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
679# glRasterPos 0, 0;
680# glCopyPixels 0, 0, $self->{w}, $self->{h};
681# glDisable GL_BLEND;
682# glColorMask 1, 1, 1, 1;
683 }; 847 };
684} 848}
685 849
686sub _draw { 850sub _draw {
687 my ($self) = @_; 851 my ($self) = @_;
688 852
689 my ($w, $h) = ($self->w, $self->h); 853 my ($w, $h) = @$self{qw(w h)};
690 854
691 my $tex = $self->{texture} 855 my $tex = $self->{texture}
692 or return; 856 or return;
693 857
694 glEnable GL_TEXTURE_2D; 858 glEnable GL_TEXTURE_2D;
… …
704 868
705package CFClient::UI::ViewPort; 869package CFClient::UI::ViewPort;
706 870
707our @ISA = CFClient::UI::Window::; 871our @ISA = CFClient::UI::Window::;
708 872
873sub new {
874 my $class = shift;
875
876 $class->SUPER::new (
877 scroll_x => 0,
878 scroll_y => 1,
879 @_,
880 )
881}
882
709sub size_request { 883sub size_request {
710 my ($self) = @_; 884 my ($self) = @_;
711 885
712 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 886 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
713 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
714 887
715 @$self{qw(child_w child_h)} 888 $w = 10 if $self->{scroll_x};
889 $h = 10 if $self->{scroll_y};
890
891 ($w, $h)
716} 892}
717 893
718sub size_allocate { 894sub size_allocate {
719 my ($self, $w, $h) = @_; 895 my ($self, $w, $h) = @_;
720 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);
721 $self->update; 903 $self->update;
722} 904}
723 905
724sub set_offset { 906sub set_offset {
725 my ($self, $x, $y) = @_; 907 my ($self, $x, $y) = @_;
… …
759} 941}
760 942
761sub _render { 943sub _render {
762 my ($self) = @_; 944 my ($self) = @_;
763 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
764 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 949 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
765 950
766 $self->SUPER::_render; 951 $self->SUPER::_render;
767} 952}
768 953
… …
771package CFClient::UI::ScrolledWindow; 956package CFClient::UI::ScrolledWindow;
772 957
773our @ISA = CFClient::UI::HBox::; 958our @ISA = CFClient::UI::HBox::;
774 959
775sub new { 960sub new {
776 my $class = shift; 961 my ($class, %arg) = @_;
962
963 my $child = delete $arg{child};
777 964
778 my $self; 965 my $self;
779 966
780 my $slider = new CFClient::UI::Slider 967 my $slider = new CFClient::UI::Slider
781 vertical => 1, 968 vertical => 1,
782 range => [0, 0, 1, 0.01], # HACK fix 969 range => [0, 0, 1, 0.01], # HACK fix
783 connect_changed => sub { 970 on_changed => sub {
784 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 971 $self->{vp}->set_offset (0, $_[1]);
785 }, 972 },
786 ; 973 ;
787 974
788 $self = $class->SUPER::new ( 975 $self = $class->SUPER::new (
789 vp => (new CFClient::UI::ViewPort), 976 vp => (new CFClient::UI::ViewPort expand => 1),
790 slider => $slider, 977 slider => $slider,
791 @_, 978 %arg,
792 ); 979 );
793 980
794 $self->{vp}->add ($self->{scrolled});
795 $self->add ($self->{vp});
796 $self->add ($self->{slider}); 981 $self->SUPER::add ($self->{vp}, $self->{slider});
982 $self->add ($child) if $child;
797 983
798 $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]);
799} 1010}
800 1011
801#TODO# update range on size_allocate depending on child 1012#TODO# update range on size_allocate depending on child
802# update viewport offset on scroll 1013# update viewport offset on scroll
803 1014
… …
823 1034
824 if ($self->{bg}) { 1035 if ($self->{bg}) {
825 my ($w, $h) = @$self{qw(w h)}; 1036 my ($w, $h) = @$self{qw(w h)};
826 1037
827 glEnable GL_BLEND; 1038 glEnable GL_BLEND;
828 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1039 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
829 glColor @{ $self->{bg} }; 1040 glColor_premultiply @{ $self->{bg} };
830 1041
831 glBegin GL_QUADS; 1042 glBegin GL_QUADS;
832 glVertex 0 , 0; 1043 glVertex 0 , 0;
833 glVertex 0 , $h; 1044 glVertex 0 , $h;
834 glVertex $w, $h; 1045 glVertex $w, $h;
… …
847 1058
848our @ISA = CFClient::UI::Bin::; 1059our @ISA = CFClient::UI::Bin::;
849 1060
850use CFClient::OpenGL; 1061use CFClient::OpenGL;
851 1062
852my @tex = 1063my $bg =
1064 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1065 mipmap => 1, wrap => 1;
1066
1067my @border =
853 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1068 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
854 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);
855 1070
856sub new { 1071sub new {
857 my $class = shift; 1072 my ($class, %arg) = @_;
858 1073
859 # TODO: user_x, user_y, overwrite moveto? 1074 my $title = delete $arg{title};
860 1075
861 my $self = $class->SUPER::new ( 1076 my $self = $class->SUPER::new (
862 bg => [1, 1, 1, 1], 1077 bg => [1, 1, 1, 1],
863 border_bg => [1, 1, 1, 1], 1078 border_bg => [1, 1, 1, 1],
864 border => 0.6, 1079 border => 0.6,
865 toplevel => 1,
866 can_events => 1, 1080 can_events => 1,
867 @_ 1081 min_w => 16,
1082 min_h => 16,
1083 %arg,
868 ); 1084 );
869 1085
870 $self->{title} &&= new CFClient::UI::Label 1086 $self->{title} = new CFClient::UI::Label
871 align => 0, 1087 align => 0,
872 valign => 1, 1088 valign => 1,
873 text => $self->{title}, 1089 text => $title,
874 fontsize => $self->{border}; 1090 fontsize => $self->{border}
1091 if defined $title;
875 1092
876 $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};
877} 1101}
878 1102
879sub border { 1103sub border {
880 int $_[0]{border} * $::FONTSIZE 1104 int $_[0]{border} * $::FONTSIZE
881} 1105}
882 1106
883sub size_request { 1107sub size_request {
884 my ($self) = @_; 1108 my ($self) = @_;
1109
1110 $self->{title}->size_request
1111 if $self->{title};
885 1112
886 my ($w, $h) = $self->SUPER::size_request; 1113 my ($w, $h) = $self->SUPER::size_request;
887 1114
888 ( 1115 (
889 $w + $self->border * 2, 1116 $w + $self->border * 2,
… …
892} 1119}
893 1120
894sub size_allocate { 1121sub size_allocate {
895 my ($self, $w, $h) = @_; 1122 my ($self, $w, $h) = @_;
896 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
897 $h -= List::Util::max 0, $self->border * 2; 1132 $h -= List::Util::max 0, $border * 2;
898 $w -= List::Util::max 0, $self->border * 2; 1133 $w -= List::Util::max 0, $border * 2;
899 1134
900 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
901 if $self->{title};
902
903 $self->child->configure ($self->border, $self->border, $w, $h); 1135 $self->child->configure ($border, $border, $w, $h);
904} 1136}
905 1137
906sub button_down { 1138sub button_down {
907 my ($self, $ev, $x, $y) = @_; 1139 my ($self, $ev, $x, $y) = @_;
908 1140
… …
924 my ($ev, $x, $y) = @_; 1156 my ($ev, $x, $y) = @_;
925 1157
926 my $dx = $ev->{x} - $ox; 1158 my $dx = $ev->{x} - $ox;
927 my $dy = $ev->{y} - $oy; 1159 my $dy = $ev->{y} - $oy;
928 1160
929 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1161 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
930 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1162 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1163
931 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1164 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
932 $self->check_size; 1165 $self->realloc;
933 }; 1166 };
934 1167
935 } elsif ($lr ^ $td) { 1168 } elsif ($lr ^ $td) {
936 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1169 my ($ox, $oy) = ($ev->{x}, $ev->{y});
937 my ($bx, $by) = ($self->{x}, $self->{y}); 1170 my ($bx, $by) = ($self->{x}, $self->{y});
… …
939 $self->{motion} = sub { 1172 $self->{motion} = sub {
940 my ($ev, $x, $y) = @_; 1173 my ($ev, $x, $y) = @_;
941 1174
942 ($x, $y) = ($ev->{x}, $ev->{y}); 1175 ($x, $y) = ($ev->{x}, $ev->{y});
943 1176
944 $self->move ($bx + $x - $ox, $by + $y - $oy); 1177 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
945 $self->update; 1178 # HACK: the next line is required to enforce placement
1179 $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
946 }; 1180 };
1181 } else {
1182 return 0;
1183 }
1184
947 } 1185 1
948} 1186}
949 1187
950sub button_up { 1188sub button_up {
951 my ($self, $ev, $x, $y) = @_; 1189 my ($self, $ev, $x, $y) = @_;
952 1190
953 delete $self->{motion}; 1191 !!delete $self->{motion}
954} 1192}
955 1193
956sub mouse_motion { 1194sub mouse_motion {
957 my ($self, $ev, $x, $y) = @_; 1195 my ($self, $ev, $x, $y) = @_;
958 1196
959 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1197 $self->{motion}->($ev, $x, $y) if $self->{motion};
1198
1199 !!$self->{motion}
960} 1200}
961 1201
962sub _draw { 1202sub _draw {
963 my ($self) = @_; 1203 my ($self) = @_;
964 1204
1205 my $child = $self->{children}[0];
1206
965 my ($w, $h ) = ($self->{w}, $self->{h}); 1207 my ($w, $h ) = ($self->{w}, $self->{h});
966 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1208 my ($cw, $ch) = ($child->{w}, $child->{h});
967 1209
968 glEnable GL_TEXTURE_2D; 1210 glEnable GL_TEXTURE_2D;
969 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1211 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
970 1212
971 my $border = $self->border; 1213 my $border = $self->border;
972 1214
973 glColor @{ $self->{border_bg} }; 1215 glColor @{ $self->{border_bg} };
974 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1216 $border[0]->draw_quad_alpha (0, 0, $w, $border);
975 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1217 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
976 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1218 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
977 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1219 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
978 1220
979 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1221 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
980 my $bg = $tex[0]; 1222 glColor @{ $self->{bg} };
981 1223
982 # TODO: repeat texture not scale 1224 # TODO: repeat texture not scale
1225 # solve this better(?)
983 my $rep_x = $cw / $bg->{w}; 1226 $bg->{s} = $cw / $bg->{w};
984 my $rep_y = $ch / $bg->{h}; 1227 $bg->{t} = $ch / $bg->{h};
985
986 glColor @{ $self->{bg} };
987
988 $bg->{s} = $rep_x;
989 $bg->{t} = $rep_y;
990 $bg->{wrap_mode} = 1;
991 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1228 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
992 } 1229 }
993 1230
994 glDisable GL_TEXTURE_2D; 1231 glDisable GL_TEXTURE_2D;
995 1232
996 $self->{title}->draw if $self->{title};
997
998 $self->child->draw; 1233 $child->draw;
1234
1235 if ($self->{title}) {
1236 glTranslate 0, $border - $self->{h};
1237 $self->{title}->_draw;
1238 }
999} 1239}
1000 1240
1001############################################################################# 1241#############################################################################
1002 1242
1003package CFClient::UI::Table; 1243package CFClient::UI::Table;
… …
1011sub new { 1251sub new {
1012 my $class = shift; 1252 my $class = shift;
1013 1253
1014 $class->SUPER::new ( 1254 $class->SUPER::new (
1015 col_expand => [], 1255 col_expand => [],
1016 @_ 1256 @_,
1017 ) 1257 )
1258}
1259
1260sub children {
1261 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1018} 1262}
1019 1263
1020sub add { 1264sub add {
1021 my ($self, $x, $y, $child) = @_; 1265 my ($self, $x, $y, $child) = @_;
1022 1266
1023 $child->set_parent ($self); 1267 $child->set_parent ($self);
1024 $self->{children}[$y][$x] = $child; 1268 $self->{children}[$y][$x] = $child;
1025 1269
1026 $child->check_size; 1270 $self->realloc;
1027} 1271}
1028 1272
1029sub children {
1030 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1031}
1032
1033# 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?
1034sub clear { 1274sub clear {
1035 my ($self) = @_; 1275 my ($self) = @_;
1036 1276
1037 my @children = $self->children; 1277 my @children = $self->children;
1038 delete $self->{children}; 1278 delete $self->{children};
… …
1040 for (@children) { 1280 for (@children) {
1041 delete $_->{parent}; 1281 delete $_->{parent};
1042 $_->hide; 1282 $_->hide;
1043 } 1283 }
1044 1284
1045 $self->update; 1285 $self->realloc;
1046} 1286}
1047 1287
1048sub get_wh { 1288sub get_wh {
1049 my ($self) = @_; 1289 my ($self) = @_;
1050 1290
… …
1081sub size_allocate { 1321sub size_allocate {
1082 my ($self, $w, $h) = @_; 1322 my ($self, $w, $h) = @_;
1083 1323
1084 my ($ws, $hs) = $self->get_wh; 1324 my ($ws, $hs) = $self->get_wh;
1085 1325
1086 my $req_w = sum @$ws; 1326 my $req_w = (sum @$ws) || 1;
1087 my $req_h = sum @$hs; 1327 my $req_h = (sum @$hs) || 1;
1088 1328
1089 # TODO: nicer code && do row_expand 1329 # TODO: nicer code && do row_expand
1090 my @col_expand = @{$self->{col_expand}}; 1330 my @col_expand = @{$self->{col_expand}};
1091 @col_expand = (1) x @$ws unless @col_expand; 1331 @col_expand = (1) x @$ws unless @col_expand;
1092 my $col_expand = (sum @col_expand) || 1; 1332 my $col_expand = (sum @col_expand) || 1;
… …
1146 } 1386 }
1147} 1387}
1148 1388
1149############################################################################# 1389#############################################################################
1150 1390
1151package CFClient::UI::HBox; 1391package CFClient::UI::Box;
1152
1153# TODO: wrap into common Box base class
1154 1392
1155our @ISA = CFClient::UI::Container::; 1393our @ISA = CFClient::UI::Container::;
1156 1394
1157sub size_request { 1395sub size_request {
1158 my ($self) = @_; 1396 my ($self) = @_;
1159 1397
1160 my @alloc = map [$_->size_request], @{$self->{children}}; 1398 $self->{vertical}
1161 1399 ? (
1162 ( 1400 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1163 (List::Util::sum map $_->[0], @alloc), 1401 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1164 (List::Util::max map $_->[1], @alloc), 1402 )
1165 ) 1403 : (
1404 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1405 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1406 )
1166} 1407}
1167 1408
1168sub size_allocate { 1409sub size_allocate {
1169 my ($self, $w, $h) = @_; 1410 my ($self, $w, $h) = @_;
1170 1411
1171 ($h, $w) = ($w, $h); 1412 my $space = $self->{vertical} ? $h : $w;
1172
1173 my $children = $self->{children}; 1413 my $children = $self->{children};
1174 1414
1175 my @h = map $_->{req_w}, @$children; 1415 my @req;
1176 1416
1177 my $req_h = List::Util::sum @h; 1417 if ($self->{homogeneous}) {
1178 1418 @req = ($space / (@$children || 1)) x @$children;
1179 if ($req_h > $h) {
1180 # ah well, not enough space
1181 $_ *= $h / $req_h for @h;
1182 } 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 {
1183 my $exp = List::Util::sum map $_->{expand}, @$children; 1427 my $expand = (List::Util::sum map $_->{expand}, @$children) || 1;
1184 $exp ||= 1;
1185 1428
1429 $space = ($space - $req) / $expand; # remaining space to give away
1430
1431 $req[$_] += $space * $children->[$_]{expand}
1186 for (0 .. $#$children) { 1432 for 0 .. $#$children;
1187 my $child = $children->[$_];
1188
1189 my $alloc_h = $h[$_];
1190 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1191 $h[$_] = $alloc_h;
1192 } 1433 }
1193 } 1434 }
1194 1435
1195 CFClient::UI::harmonize \@h; 1436 CFClient::UI::harmonize \@req;
1196 1437
1197 my $y = 0; 1438 my $pos = 0;
1198 for (0 .. $#$children) { 1439 for (0 .. $#$children) {
1199 my $child = $children->[$_];
1200 my $h = $h[$_]; 1440 my $alloc = $req[$_];
1201 $child->configure ($y, 0, $h, $w); 1441 $children->[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1202 1442
1203 $y += $h; 1443 $pos += $alloc;
1204 } 1444 }
1205 1445
1206 1 1446 1
1207} 1447}
1208 1448
1209############################################################################# 1449#############################################################################
1210 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
1211package CFClient::UI::VBox; 1466package CFClient::UI::VBox;
1212 1467
1213# TODO: wrap into common Box base class
1214
1215our @ISA = CFClient::UI::Container::; 1468our @ISA = CFClient::UI::Box::;
1216 1469
1217sub size_request { 1470sub new {
1218 my ($self) = @_; 1471 my $class = shift;
1219 1472
1220 my @alloc = map [$_->size_request], @{$self->{children}}; 1473 $class->SUPER::new (
1221 1474 vertical => 1,
1222 ( 1475 @_,
1223 (List::Util::max map $_->[0], @alloc),
1224 (List::Util::sum map $_->[1], @alloc),
1225 ) 1476 )
1226} 1477}
1227 1478
1228sub size_allocate {
1229 my ($self, $w, $h) = @_;
1230
1231 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1232
1233 my $children = $self->{children};
1234
1235 my @h = map $_->{req_h}, @$children;
1236
1237 my $req_h = List::Util::sum @h;
1238
1239 if ($req_h > $h) {
1240 # ah well, not enough space
1241 $_ *= $h / $req_h for @h;
1242 } else {
1243 my $exp = List::Util::sum map $_->{expand}, @$children;
1244 $exp ||= 1;
1245
1246 for (0 .. $#$children) {
1247 my $child = $children->[$_];
1248
1249 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1250 }
1251 }
1252
1253 CFClient::UI::harmonize \@h;
1254
1255 my $y = 0;
1256 for (0 .. $#$children) {
1257 my $child = $children->[$_];
1258 my $h = $h[$_];
1259 $child->configure (0, $y, $w, $h);
1260
1261 $y += $h;
1262 }
1263
1264 1
1265}
1266
1267############################################################################# 1479#############################################################################
1268 1480
1269package CFClient::UI::Label; 1481package CFClient::UI::Label;
1270 1482
1271our @ISA = CFClient::UI::Base::; 1483our @ISA = CFClient::UI::DrawBG::;
1272 1484
1273use CFClient::OpenGL; 1485use CFClient::OpenGL;
1274 1486
1275sub new { 1487sub new {
1276 my ($class, %arg) = @_; 1488 my ($class, %arg) = @_;
1277 1489
1278 my $self = $class->SUPER::new ( 1490 my $self = $class->SUPER::new (
1279 fg => [1, 1, 1], 1491 fg => [1, 1, 1],
1492 #bg => none
1493 #active_bg => none
1280 #font => default_font 1494 #font => default_font
1281 #text => initial text 1495 #text => initial text
1282 #markup => initial narkup 1496 #markup => initial narkup
1497 #max_w => maximum pixel width
1498 ellipsise => 3, # end
1283 layout => (new CFClient::Layout), 1499 layout => (new CFClient::Layout),
1284 fontsize => 1, 1500 fontsize => 1,
1285 align => -1, 1501 align => -1,
1286 valign => -1, 1502 valign => -1,
1287 padding => 2, 1503 padding_x => 2,
1504 padding_y => 2,
1288 can_events => 0, 1505 can_events => 0,
1289 %arg 1506 %arg
1290 ); 1507 );
1291 1508
1292 if (exists $self->{template}) { 1509 if (exists $self->{template}) {
… …
1302 } 1519 }
1303 1520
1304 $self 1521 $self
1305} 1522}
1306 1523
1307sub escape { 1524sub escape($) {
1308 local $_ = $_[1]; 1525 local $_ = $_[0];
1309 1526
1310 s/&/&amp;/g; 1527 s/&/&amp;/g;
1311 s/>/&gt;/g; 1528 s/>/&gt;/g;
1312 s/</&lt;/g; 1529 s/</&lt;/g;
1313 1530
1314 $_[1] 1531 $_
1315} 1532}
1316 1533
1317sub update { 1534sub update {
1318 my ($self) = @_; 1535 my ($self) = @_;
1319 1536
… …
1328 $self->{text} = "T$text"; 1545 $self->{text} = "T$text";
1329 1546
1330 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1547 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1331 $self->{layout}->set_text ($text); 1548 $self->{layout}->set_text ($text);
1332 1549
1550 $self->realloc;
1333 $self->update; 1551 $self->update;
1334 $self->check_size;
1335} 1552}
1336 1553
1337sub set_markup { 1554sub set_markup {
1338 my ($self, $markup) = @_; 1555 my ($self, $markup) = @_;
1339 1556
… …
1343 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1560 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1344 1561
1345 $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;
1346 $self->{layout}->set_markup ($markup); 1563 $self->{layout}->set_markup ($markup);
1347 1564
1565 $self->realloc;
1348 $self->update; 1566 $self->update;
1349 $self->check_size;
1350} 1567}
1351 1568
1352sub size_request { 1569sub size_request {
1353 my ($self) = @_; 1570 my ($self) = @_;
1354 1571
1355 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1572 $self->{layout}->set_font ($self->{font}) if $self->{font};
1356 $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});
1357 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1576 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1358 1577
1359 my ($w, $h) = $self->{layout}->size; 1578 my ($w, $h) = $self->{layout}->size;
1360 1579
1361 if (exists $self->{template}) { 1580 if (exists $self->{template}) {
… …
1366 1585
1367 $w = List::Util::max $w, $w2; 1586 $w = List::Util::max $w, $w2;
1368 $h = List::Util::max $h, $h2; 1587 $h = List::Util::max $h, $h2;
1369 } 1588 }
1370 1589
1371 ( 1590 ($w, $h)
1372 $w + $self->{padding} * 2,
1373 $h + $self->{padding} * 2,
1374 )
1375} 1591}
1376 1592
1377sub size_allocate { 1593sub size_allocate {
1378 my ($self, $w, $h) = @_; 1594 my ($self, $w, $h) = @_;
1379 1595
1596 delete $self->{ox};
1597
1380 delete $self->{texture}; 1598 delete $self->{texture}
1599 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1381} 1600}
1382 1601
1383sub set_fontsize { 1602sub set_fontsize {
1384 my ($self, $fontsize) = @_; 1603 my ($self, $fontsize) = @_;
1385 1604
1386 $self->{fontsize} = $fontsize; 1605 $self->{fontsize} = $fontsize;
1387 delete $self->{texture}; 1606 delete $self->{texture};
1388 1607
1389 $self->update; 1608 $self->realloc;
1390 $self->check_size;
1391} 1609}
1392 1610
1393sub _draw { 1611sub _draw {
1394 my ($self) = @_; 1612 my ($self) = @_;
1613
1614 $self->SUPER::_draw; # draw background, if applicable
1395 1615
1396 my $tex = $self->{texture} ||= do { 1616 my $tex = $self->{texture} ||= do {
1397 $self->{layout}->set_foreground (@{$self->{fg}}); 1617 $self->{layout}->set_foreground (@{$self->{fg}});
1398 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1618 $self->{layout}->set_font ($self->{font}) if $self->{font};
1399 $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});
1400 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1622 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1401 1623
1402 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1624 new_from_layout CFClient::Texture $self->{layout}
1625 };
1403 1626
1627 unless (exists $self->{ox}) {
1404 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1628 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1405 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1629 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1406 : ($self->{w} - $tex->{w}) * 0.5); 1630 : ($self->{w} - $tex->{w}) * 0.5);
1407 1631
1408 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1632 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1409 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1633 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1410 : ($self->{h} - $tex->{h}) * 0.5); 1634 : ($self->{h} - $tex->{h}) * 0.5);
1411
1412 $tex
1413 }; 1635 };
1414 1636
1415 glEnable GL_TEXTURE_2D; 1637 glEnable GL_TEXTURE_2D;
1416 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1638 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1417 1639
1640 glColor_premultiply @{$self->{fg}}
1418 if ($tex->{format} == GL_ALPHA) { 1641 if $tex->{format} == GL_ALPHA;
1419 glColor @{$self->{fg}}; 1642
1420 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1421 } else {
1422 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1643 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1423 }
1424 1644
1425 glDisable GL_TEXTURE_2D; 1645 glDisable GL_TEXTURE_2D;
1426} 1646}
1427 1647
1428############################################################################# 1648#############################################################################
… …
1443 active_fg => [0, 0, 0], 1663 active_fg => [0, 0, 0],
1444 can_hover => 1, 1664 can_hover => 1,
1445 can_focus => 1, 1665 can_focus => 1,
1446 valign => 0, 1666 valign => 0,
1447 can_events => 1, 1667 can_events => 1,
1668 #text => ...
1448 @_ 1669 @_
1449 ) 1670 )
1450} 1671}
1451 1672
1452sub _set_text { 1673sub _set_text {
… …
1454 1675
1455 delete $self->{cur_h}; 1676 delete $self->{cur_h};
1456 1677
1457 return if $self->{text} eq $text; 1678 return if $self->{text} eq $text;
1458 1679
1459 delete $self->{texture};
1460
1461 $self->{last_activity} = $::NOW; 1680 $self->{last_activity} = $::NOW;
1462 $self->{text} = $text; 1681 $self->{text} = $text;
1463 1682
1464 $text =~ s/./*/g if $self->{hidden}; 1683 $text =~ s/./*/g if $self->{hidden};
1465 $self->{layout}->set_text ("$text "); 1684 $self->{layout}->set_text ("$text ");
1466 1685
1467 $self->emit (changed => $self->{text}); 1686 $self->_emit (changed => $self->{text});
1687 $self->update;
1468} 1688}
1469 1689
1470sub set_text { 1690sub set_text {
1471 my ($self, $text) = @_; 1691 my ($self, $text) = @_;
1472 1692
1473 $self->{cursor} = length $text; 1693 $self->{cursor} = length $text;
1474 $self->_set_text ($text); 1694 $self->_set_text ($text);
1475 $self->update; 1695
1476 $self->check_size; 1696 $self->realloc;
1477} 1697}
1478 1698
1479sub get_text { 1699sub get_text {
1480 $_[0]{text} 1700 $_[0]{text}
1481} 1701}
… …
1484 my ($self) = @_; 1704 my ($self) = @_;
1485 1705
1486 my ($w, $h) = $self->SUPER::size_request; 1706 my ($w, $h) = $self->SUPER::size_request;
1487 1707
1488 ($w + 1, $h) # add 1 for cursor 1708 ($w + 1, $h) # add 1 for cursor
1489}
1490
1491sub size_allocate {
1492 my ($self, $w, $h) = @_;
1493
1494 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1495} 1709}
1496 1710
1497sub key_down { 1711sub key_down {
1498 my ($self, $ev) = @_; 1712 my ($self, $ev) = @_;
1499 1713
… …
1514 } elsif ($sym == CFClient::SDLK_HOME) { 1728 } elsif ($sym == CFClient::SDLK_HOME) {
1515 $self->{cursor} = 0; 1729 $self->{cursor} = 0;
1516 } elsif ($sym == CFClient::SDLK_END) { 1730 } elsif ($sym == CFClient::SDLK_END) {
1517 $self->{cursor} = length $text; 1731 $self->{cursor} = length $text;
1518 } elsif ($uni == 27) { 1732 } elsif ($uni == 27) {
1519 $self->emit ('escape'); 1733 $self->_emit ('escape');
1520 } elsif ($uni) { 1734 } elsif ($uni) {
1521 substr $text, $self->{cursor}++, 0, chr $uni; 1735 substr $text, $self->{cursor}++, 0, chr $uni;
1736 } else {
1737 return 0;
1522 } 1738 }
1523 1739
1524 $self->_set_text ($text); 1740 $self->_set_text ($text);
1525 $self->update; 1741
1526 $self->check_size; 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;
… …
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 => .05, 2263 inner_pad => 0.02,
2030 @_ 2264 @_
2031 ); 2265 );
2032 2266
2033 $self->set_value ($self->{range}[0]); 2267 $self->set_value ($self->{range}[0]);
2034 $self->update; 2268 $self->update;
2035 2269
2036 $self 2270 $self
2037} 2271}
2038 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
2039sub set_value { 2284sub set_value {
2040 my ($self, $value) = @_; 2285 my ($self, $value) = @_;
2041 2286
2042 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2287 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2043 2288
2044 $hi = $lo + 1 if $hi <= $lo; 2289 $hi = $lo + 1 if $hi <= $lo;
2045 2290
2291 $page = $hi - $lo if $page > $hi - $lo;
2292
2046 $value = $lo if $value < $lo; 2293 $value = $lo if $value < $lo;
2047 $value = $hi if $value > $hi; 2294 $value = $hi - $page if $value > $hi - $page;
2048 2295
2049 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2296 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2050 if $unit; 2297 if $unit;
2051 2298
2052 $page = $hi - $lo if $page > $hi - $lo;
2053
2054 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2299 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2055 2300
2056 if ($value != $old_value) { 2301 if ($value != $old_value) {
2057 $self->emit (changed => $value); 2302 $self->_emit (changed => $value);
2058 $self->update; 2303 $self->update;
2059 } 2304 }
2060} 2305}
2061 2306
2062sub size_request { 2307sub size_request {
2063 my ($self) = @_; 2308 my ($self) = @_;
2064 2309
2065 my $w = $self->{req_w}; 2310 ($self->{req_w}, $self->{req_h})
2066 my $h = $self->{req_h};
2067
2068 $self->{vertical} ? ($h, $w) : ($w, $h)
2069} 2311}
2070 2312
2071sub button_down { 2313sub button_down {
2072 my ($self, $ev, $x, $y) = @_; 2314 my ($self, $ev, $x, $y) = @_;
2073 2315
2074 $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
2075 $self->mouse_motion ($ev, $x, $y); 2320 $self->mouse_motion ($ev, $x, $y)
2076} 2321}
2077 2322
2078sub mouse_motion { 2323sub mouse_motion {
2079 my ($self, $ev, $x, $y) = @_; 2324 my ($self, $ev, $x, $y) = @_;
2080 2325
2081 if ($GRAB == $self) { 2326 if ($GRAB == $self) {
2082 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2327 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2083 2328
2084 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2329 my (undef, $lo, $hi, $page) = @{$self->{range}};
2085 2330
2086 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2331 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2087 2332
2088 $self->set_value ($x * ($hi - $lo) + $lo); 2333 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2334 } else {
2335 return 0;
2336 }
2337
2089 } 2338 1
2090} 2339}
2091 2340
2092sub update { 2341sub update {
2093 my ($self) = @_; 2342 my ($self) = @_;
2094 2343
2095 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2344 delete $self->{knob_w};
2345 $self->SUPER::update;
2346}
2347
2348sub _draw {
2349 my ($self) = @_;
2350
2351 unless ($self->{knob_w}) {
2096 $self->set_value ($self->{range}[0]); 2352 $self->set_value ($self->{range}[0]);
2097 2353
2098 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2354 my ($value, $lo, $hi, $page) = @{$self->{range}};
2355 my $range = ($hi - $page - $lo) || 1e-100;
2099 2356
2100 my $inner_w = 1 - 2 * $self->{inner_pad}; 2357 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2101 2358
2102 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2359 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2360 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2103 2361
2104 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2362 $value = ($value - $lo) / $range;
2105 $value = $self->{scale} * ($value - $lo); 2363 $value = $value * $self->{scale} + $self->{offset};
2106 2364
2107 $value = $self->{inner_pad} + ($value - $page * 0.5);
2108
2109 $value = 0 if $value < 0;
2110 $page = 1 - $value if $value + $page > 1;
2111
2112 $self->{knob_x} = $value; 2365 $self->{knob_x} = $value - $knob_w * 0.5;
2113 $self->{knob_w} = $page; 2366 $self->{knob_w} = $knob_w;
2114 }); 2367 }
2115
2116 $self->SUPER::update;
2117}
2118
2119sub _draw {
2120 my ($self) = @_;
2121 2368
2122 $self->SUPER::_draw (); 2369 $self->SUPER::_draw ();
2123 2370
2124 glScale $self->{w}, $self->{h}; 2371 glScale $self->{w}, $self->{h};
2125 2372
2126 if ($self->{vertical}) { 2373 if ($self->{vertical}) {
2127 # draw a vertical slider like a rotated horizontal slider 2374 # draw a vertical slider like a rotated horizontal slider
2128 2375
2376 glTranslate 1, 0, 0;
2129 glRotate 90, 0, 0, 1; 2377 glRotate 90, 0, 0, 1;
2130 glTranslate 0, 1, 0;
2131 } 2378 }
2132 2379
2133 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2380 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2134 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2381 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2135 2382
… …
2142 # draw handle 2389 # draw handle
2143 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1); 2390 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2144 2391
2145 glDisable GL_TEXTURE_2D; 2392 glDisable GL_TEXTURE_2D;
2146} 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 (@_) }
2147 2435
2148############################################################################# 2436#############################################################################
2149 2437
2150package CFClient::UI::TextView; 2438package CFClient::UI::TextView;
2151 2439
… …
2181 2469
2182 $self->{fontsize} = $fontsize; 2470 $self->{fontsize} = $fontsize;
2183 $self->reflow; 2471 $self->reflow;
2184} 2472}
2185 2473
2186sub text_height {
2187 my ($self, $text) = @_;
2188
2189 my $layout = $self->{layout};
2190
2191 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2192 $layout->set_width ($self->{children}[0]{w});
2193 $layout->set_markup ($text);
2194
2195 ($layout->size)[1]
2196}
2197
2198sub reflow {
2199 my ($self) = @_;
2200
2201 $self->{need_reflow}++;
2202 $self->update;
2203}
2204
2205sub size_allocate { 2474sub size_allocate {
2206 my ($self, $w, $h) = @_; 2475 my ($self, $w, $h) = @_;
2207 2476
2208 $self->SUPER::size_allocate ($w, $h); 2477 $self->SUPER::size_allocate ($w, $h);
2209 2478
… …
2212 $self->{layout}->set_width ($self->{children}[0]{w}); 2481 $self->{layout}->set_width ($self->{children}[0]{w});
2213 2482
2214 $self->reflow; 2483 $self->reflow;
2215} 2484}
2216 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
2217sub add_paragraph { 2520sub add_paragraph {
2218 my ($self, $color, $text) = @_; 2521 my ($self, $color, $text, $indent) = @_;
2219 2522
2220 #TODO: intelligently "reformat" paragraph 2523 for my $line (split /\n/, $text) {
2221 2524 my ($w, $h) = $self->text_size ($line);
2222 my $height = $self->text_height ($text);
2223
2224 $self->{height} += $height; 2525 $self->{height} += $h;
2526 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line];
2527 }
2225 2528
2226 push @{$self->{par}}, [$height, $color, $text];
2227
2228 $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]);
2229 $self->{children}[1]->update;
2230} 2530}
2231 2531
2232sub update { 2532sub update {
2233 my ($self) = @_; 2533 my ($self) = @_;
2234 2534
… …
2237 return unless $self->{h} > 0; 2537 return unless $self->{h} > 0;
2238 2538
2239 delete $self->{texture}; 2539 delete $self->{texture};
2240 2540
2241 $ROOT->on_post_alloc ($self, sub { 2541 $ROOT->on_post_alloc ($self, sub {
2542 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2543
2242 if (delete $self->{need_reflow}) { 2544 if (delete $self->{need_reflow}) {
2243 my $height = 0; 2545 my $height = 0;
2244 2546
2245 $height += $_->[0] = $self->text_height ($_->[2]) 2547 my $layout = $self->{layout};
2548
2549 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2550
2246 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 }
2247 2562
2248 $self->{height} = $height; 2563 $self->{height} = $height;
2249 2564
2250 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2565 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2251 2566
2252 delete $self->{texture}; 2567 delete $self->{texture};
2253 } 2568 }
2254 2569
2255 $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 {
2256 glClearColor 0, 0, 0, 0; 2571 glClearColor 0, 0, 0, 0;
2257 glClear GL_COLOR_BUFFER_BIT; 2572 glClear GL_COLOR_BUFFER_BIT;
2258 2573
2259 glEnable GL_TEXTURE_2D;
2260 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2261
2262 my $top = int $self->{children}[1]{range}[0]; 2574 my $top = int $self->{children}[1]{range}[0];
2263 2575
2264 my $y0 = $top; 2576 my $y0 = $top;
2265 my $y1 = $top + $self->{h}; 2577 my $y1 = $top + $H;
2266 2578
2267 my $y = 0; 2579 my $y = 0;
2268 2580
2269 my $layout = $self->{layout}; 2581 my $layout = $self->{layout};
2270 2582
2271 $layout->set_font ($self->{font}) if $self->{font}; 2583 $layout->set_font ($self->{font}) if $self->{font};
2272 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
2273 for my $par (@{$self->{par}}) { 2589 for my $par (@{$self->{par}}) {
2274 my $h = $par->[0]; 2590 my $h = $par->[1];
2275 2591
2276 if ($y0 < $y + $h && $y < $y1) { 2592 if ($y0 < $y + $h && $y < $y1) {
2277 $layout->set_foreground (@{ $par->[1] }); 2593 $layout->set_foreground (@{ $par->[2] });
2594 $layout->set_width ($W - $par->[3]);
2278 $layout->set_markup ($par->[2]); 2595 $layout->set_markup ($par->[4]);
2279 2596
2280 my ($W, $H) = $layout->size; 2597 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2281 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;
2282 } 2601 }
2283 2602
2284 $y += $h; 2603 $y += $h;
2285 } 2604 }
2286 2605
2287 glDisable GL_TEXTURE_2D; 2606 glDisable GL_BLEND;
2288 }; 2607 };
2289 }); 2608 });
2290} 2609}
2291 2610
2292sub _draw { 2611sub _draw {
2293 my ($self) = @_; 2612 my ($self) = @_;
2294 2613
2295 glEnable GL_TEXTURE_2D; 2614 glEnable GL_TEXTURE_2D;
2296 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2615 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2297 glColor 1, 1, 1, 1; 2616 glColor 0, 0, 0, 1;
2298 $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});
2299 glDisable GL_TEXTURE_2D; 2618 glDisable GL_TEXTURE_2D;
2300 2619
2301 $self->{children}[1]->draw; 2620 $self->{children}[1]->draw;
2302 2621
… …
2352 2671
2353sub new { 2672sub new {
2354 my $class = shift; 2673 my $class = shift;
2355 2674
2356 my $self = $class->SUPER::new ( 2675 my $self = $class->SUPER::new (
2357 state => 0, 2676 state => 0,
2358 connect_activate => \&toggle_flopper, 2677 on_activate => \&toggle_flopper,
2359 @_ 2678 @_
2360 ); 2679 );
2361 2680
2362 if ($self->{state}) {
2363 $self->{state} = 0;
2364 $self->toggle_flopper;
2365 }
2366
2367 $self 2681 $self
2368} 2682}
2369 2683
2370sub toggle_flopper { 2684sub toggle_flopper {
2371 my ($self) = @_; 2685 my ($self) = @_;
2372 2686
2373 # TODO: use animation 2687 $self->{other}->toggle_visibility;
2374 if ($self->{state} = !$self->{state}) {
2375 $CFClient::UI::ROOT->add ($self->{other});
2376 $self->{other}->move ($self->coord2global (0, $self->{h}));
2377 $self->emit ("open");
2378 } else {
2379 $CFClient::UI::ROOT->remove ($self->{other});
2380 $self->emit ("close");
2381 }
2382
2383 $self->emit (changed => $self->{state});
2384} 2688}
2385 2689
2386############################################################################# 2690#############################################################################
2387 2691
2388package CFClient::UI::Tooltip; 2692package CFClient::UI::Tooltip;
… …
2401} 2705}
2402 2706
2403sub set_tooltip_from { 2707sub set_tooltip_from {
2404 my ($self, $widget) = @_; 2708 my ($self, $widget) = @_;
2405 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
2406 $self->add (new CFClient::UI::Label 2719 $self->add (new CFClient::UI::Label
2407 markup => $widget->{tooltip}, 2720 markup => $tooltip,
2408 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2721 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2409 fontsize => 0.8, 2722 fontsize => 0.8,
2410 fg => [0, 0, 0, 1], 2723 fg => [0, 0, 0, 1],
2724 ellipsise => 0,
2411 font => ($widget->{tooltip_font} || $::FONT_PROP), 2725 font => ($widget->{tooltip_font} || $::FONT_PROP),
2412 ); 2726 );
2413} 2727}
2414 2728
2415sub size_request { 2729sub size_request {
2416 my ($self) = @_; 2730 my ($self) = @_;
… …
2422 2736
2423sub size_allocate { 2737sub size_allocate {
2424 my ($self, $w, $h) = @_; 2738 my ($self, $w, $h) = @_;
2425 2739
2426 $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 });
2427} 2759}
2428 2760
2429sub _draw { 2761sub _draw {
2430 my ($self) = @_; 2762 my ($self) = @_;
2431 2763
… …
2448 glVertex $w, $h; 2780 glVertex $w, $h;
2449 glVertex $w, 0; 2781 glVertex $w, 0;
2450 glEnd; 2782 glEnd;
2451 2783
2452 glTranslate 2 - 0.375, 2 - 0.375; 2784 glTranslate 2 - 0.375, 2 - 0.375;
2785
2453 $self->SUPER::_draw; 2786 $self->SUPER::_draw;
2454} 2787}
2455 2788
2456############################################################################# 2789#############################################################################
2457 2790
… …
2462use CFClient::OpenGL; 2795use CFClient::OpenGL;
2463 2796
2464sub new { 2797sub new {
2465 my $class = shift; 2798 my $class = shift;
2466 2799
2467 $class->SUPER::new ( 2800 my $self = $class->SUPER::new (
2468 aspect => 1, 2801 aspect => 1,
2802 can_events => 0,
2469 @_, 2803 @_,
2470 ) 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
2471} 2821}
2472 2822
2473sub size_request { 2823sub size_request {
2474 (32, 8) 2824 (32, 8)
2475} 2825}
2476 2826
2827sub update {
2828 my ($self) = @_;
2829
2830 return unless $self->{visible};
2831
2832 $self->SUPER::update;
2833}
2834
2477sub _draw { 2835sub _draw {
2478 my ($self) = @_; 2836 my ($self) = @_;
2479 2837
2480 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
2481 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 2849 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2482 2850
2483 # TODO animation
2484 if ($tex) { 2851 if ($tex) {
2485 glEnable GL_TEXTURE_2D; 2852 glEnable GL_TEXTURE_2D;
2486 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2853 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2487 glColor 1, 1, 1, 1; 2854 glColor 0, 0, 0, 1;
2488 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2855 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2489 glDisable GL_TEXTURE_2D; 2856 glDisable GL_TEXTURE_2D;
2490 } 2857 }
2491} 2858}
2492 2859
2860sub DESTROY {
2861 my ($self) = @_;
2862
2863 $self->{timer}->cancel
2864 if $self->{timer};
2865
2866 $self->SUPER::DESTROY;
2867}
2868
2493############################################################################# 2869#############################################################################
2494 2870
2495package CFClient::UI::InventoryItem; 2871package CFClient::UI::Buttonbar;
2496 2872
2497our @ISA = CFClient::UI::HBox::; 2873our @ISA = CFClient::UI::HBox::;
2498 2874
2499sub new { 2875# TODO: should actualyl wrap buttons and other goodies.
2500 my $class = shift;
2501
2502 my %args = @_;
2503
2504 my $item = delete $args{item};
2505
2506 my $desc = $item->{nrof} < 2
2507 ? $item->{name}
2508 : "$item->{nrof} $item->{name_pl}";
2509
2510 $item->{flags} & Crossfire::Protocol::F_OPEN
2511 and $desc .= " (open)";
2512 $item->{flags} & Crossfire::Protocol::F_APPLIED
2513 and $desc .= " (applied)";
2514 $item->{flags} & Crossfire::Protocol::F_UNPAID
2515 and $desc .= " (unpaid)";
2516 $item->{flags} & Crossfire::Protocol::F_MAGIC
2517 and $desc .= " (magic)";
2518 $item->{flags} & Crossfire::Protocol::F_CURSED
2519 and $desc .= " (cursed)";
2520 $item->{flags} & Crossfire::Protocol::F_DAMNED
2521 and $desc .= " (damned)";
2522 $item->{flags} & Crossfire::Protocol::F_LOCKED
2523 and $desc .= " *";
2524
2525 my $self = $class->SUPER::new (
2526 can_hover => 1,
2527 can_events => 1,
2528 tooltip => (CFClient::UI::Label->escape ($desc)
2529 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2530 connect_button_down => sub {
2531 my ($self, $ev, $x, $y) = @_;
2532
2533 # todo: maybe put examine on 1? but should just be a tooltip :(
2534 if ($ev->{button} == 1) {
2535 $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
2536 } elsif ($ev->{button} == 2) {
2537 $::CONN->send ("apply $item->{tag}");
2538 } elsif ($ev->{button} == 3) {
2539 my @menu_items = (
2540 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2541 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2542 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2543 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2544 [
2545 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2546 sub { $::CONN->send ("lock ". () ."$item->{tag}") },
2547 ],
2548 );
2549
2550 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2551 }
2552
2553 1
2554 },
2555 %args
2556 );
2557
2558 $self->add (new CFClient::UI::Face
2559 can_events => 0,
2560 face => $item->{face},
2561 anim => $item->{anim},
2562 animspeed => $item->{animspeed},
2563 );
2564
2565 $self->add (new CFClient::UI::Label
2566 can_events => 0,
2567 text => $desc,
2568 );
2569
2570 $self
2571}
2572
2573#############################################################################
2574
2575package CFClient::UI::Inventory;
2576
2577our @ISA = CFClient::UI::ScrolledWindow::;
2578
2579sub new {
2580 my $class = shift;
2581
2582 my $self = $class->SUPER::new (
2583 scrolled => (new CFClient::UI::VBox),
2584 @_,
2585 );
2586
2587 $self
2588}
2589
2590sub set_items {
2591 my ($self, $items) = @_;
2592
2593 $self->{scrolled}->clear;
2594 return unless $items;
2595
2596 my @items = sort {
2597 ($a->{type} <=> $b->{type})
2598 or ($a->{name} cmp $b->{name})
2599 } @$items;
2600
2601 $self->{real_items} = \@items;
2602
2603 for my $item (@items) {
2604 my $desc = $item->{nrof} < 2
2605 ? $item->{name}
2606 : "$item->{nrof} $item->{name_pl}";
2607
2608 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2609 }
2610
2611 $self->{scrolled}->add (@items);
2612
2613# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2614}
2615
2616sub size_request {
2617 my ($self) = @_;
2618 ($self->{req_w}, $self->{req_h});
2619}
2620 2876
2621############################################################################# 2877#############################################################################
2622 2878
2623package CFClient::UI::Menu; 2879package CFClient::UI::Menu;
2624 2880
… …
2658 2914
2659# 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)
2660sub popup { 2916sub popup {
2661 my ($self, $ev) = @_; 2917 my ($self, $ev) = @_;
2662 2918
2663 $self->emit ("popdown"); 2919 $self->_emit ("popdown");
2664 2920
2665 # maybe save $GRAB? must be careful about events... 2921 # maybe save $GRAB? must be careful about events...
2666 $GRAB = $self; 2922 $GRAB = $self;
2667 $self->{button} = $ev->{button}; 2923 $self->{button} = $ev->{button};
2668 2924
2669 $self->show; 2925 $self->show;
2670 $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);
2671} 2927}
2672 2928
2673sub mouse_motion { 2929sub mouse_motion {
2674 my ($self, $ev, $x, $y) = @_; 2930 my ($self, $ev, $x, $y) = @_;
2675 2931
2676 # TODO: should use vbox->find_widget or so 2932 # TODO: should use vbox->find_widget or so
2677 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 2933 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2678 $self->{hover} = $self->{item}{$HOVER}; 2934 $self->{hover} = $self->{item}{$HOVER};
2935
2936 0
2679} 2937}
2680 2938
2681sub button_up { 2939sub button_up {
2682 my ($self, $ev, $x, $y) = @_; 2940 my ($self, $ev, $x, $y) = @_;
2683 2941
2684 if ($ev->{button} == $self->{button}) { 2942 if ($ev->{button} == $self->{button}) {
2685 undef $GRAB; 2943 undef $GRAB;
2686 $self->hide; 2944 $self->hide;
2687 2945
2688 $self->emit ("popdown"); 2946 $self->_emit ("popdown");
2689 $self->{hover}[1]->() if $self->{hover}; 2947 $self->{hover}[1]->() if $self->{hover};
2948 } else {
2949 return 0
2950 }
2951
2690 } 2952 1
2691} 2953}
2692 2954
2693############################################################################# 2955#############################################################################
2694 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
2695package CFClient::UI::Statusbox; 3065package CFClient::UI::Statusbox;
2696 3066
2697our @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}
2698 3077
2699sub reorder { 3078sub reorder {
2700 my ($self) = @_; 3079 my ($self) = @_;
2701 my $NOW = time; 3080 my $NOW = time;
2702 3081
… …
2722 : $item->{text}; 3101 : $item->{text};
2723 3102
2724 for ($short) { 3103 for ($short) {
2725 s/^\s+//; 3104 s/^\s+//;
2726 s/\s+/ /g; 3105 s/\s+/ /g;
2727 my $len = int 40 / $item->{fontsize};
2728 substr $_, $len, length, "…" if $len < length;
2729 } 3106 }
2730 3107
2731 new CFClient::UI::Label 3108 new CFClient::UI::Label
2732 markup => $short, 3109 markup => $short,
2733 tooltip => $item->{tooltip}, 3110 tooltip => $item->{tooltip},
2734 tooltip_font => $::FONT_PROP, 3111 tooltip_font => $::FONT_PROP,
2735 tooltip_width => 0.67, 3112 tooltip_width => 0.67,
2736 fontsize => $item->{fontsize}, 3113 fontsize => $item->{fontsize} || $self->{fontsize},
3114 max_w => $::WIDTH * 0.44,
2737 fg => $item->{fg}, 3115 fg => $item->{fg},
2738 can_events => 1, 3116 can_events => 1,
2739 can_hover => 1 3117 can_hover => 1
2740 }; 3118 };
2741 } 3119 }
… …
2747sub add { 3125sub add {
2748 my ($self, $text, %arg) = @_; 3126 my ($self, $text, %arg) = @_;
2749 3127
2750 $text =~ s/^\s+//; 3128 $text =~ s/^\s+//;
2751 $text =~ s/\s+$//; 3129 $text =~ s/\s+$//;
3130
3131 return unless $text;
2752 3132
2753 my $timeout = time + ((delete $arg{timeout}) || 60); 3133 my $timeout = time + ((delete $arg{timeout}) || 60);
2754 3134
2755 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3135 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2756 3136
… …
2768 $self->{item}{$group} = { 3148 $self->{item}{$group} = {
2769 id => ++$self->{id}, 3149 id => ++$self->{id},
2770 text => $text, 3150 text => $text,
2771 timeout => $timeout, 3151 timeout => $timeout,
2772 tooltip => $text, 3152 tooltip => $text,
2773 fontsize => 0.8,
2774 fg => [0.8, 0.8, 0.8, 0.8], 3153 fg => [0.8, 0.8, 0.8, 0.8],
2775 pri => 0, 3154 pri => 0,
2776 count => 1, 3155 count => 1,
2777 %arg, 3156 %arg,
2778 }; 3157 };
2779 } 3158 }
2780 3159
2781 $self->reorder; 3160 $self->reorder;
2782} 3161}
2783 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
2784############################################################################# 3173#############################################################################
2785 3174
2786package CFClient::UI::Root; 3175package CFClient::UI::Inventory;
2787 3176
2788our @ISA = CFClient::UI::Container::; 3177our @ISA = CFClient::UI::ScrolledWindow::;
2789
2790use CFClient::OpenGL;
2791 3178
2792sub new { 3179sub new {
2793 my $class = shift; 3180 my $class = shift;
2794 3181
2795 $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 => [],
2796 @_, 3424 @_,
2797 ) 3425 )
2798} 3426}
2799 3427
2800sub configure { 3428# XXX: Do sorting? Argl...
2801 my ($self, $x, $y, $w, $h) = @_; 3429sub add_spell {
2802
2803 $self->{w} = $w;
2804 $self->{h} = $h;
2805}
2806
2807sub check_size {
2808 my ($self) = @_; 3430 my ($self, $spell) = @_;
3431 $self->{spells}->{$spell->{name}} = $spell;
2809 3432
2810 $self->size_allocate ($self->{w}, $self->{h}) 3433 $self->add (0, $self->{tbl_idx}, new CFClient::UI::Face
2811 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
2812} 3487}
2813 3488
2814sub size_request { 3489sub size_request {
2815 my ($self) = @_; 3490 my ($self) = @_;
2816 3491
2817 ($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
2818} 3507}
2819 3508
2820sub size_allocate { 3509sub size_allocate {
2821 my ($self, $w, $h) = @_; 3510 my ($self, $w, $h) = @_;
2822 3511
2823 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2824 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2825
2826 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2827 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2828
2829 for my $child ($self->children) { 3512 for my $child ($self->children) {
2830 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)};
2831 3514
2832 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3515 $X = $child->{force_x} if exists $child->{force_x};
2833 if exists $child->{req_x}; 3516 $Y = $child->{force_y} if exists $child->{force_y};
2834 3517
2835 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3518 $X = _to_pixel $X, $W, $self->{w};
2836 if exists $child->{req_y}; 3519 $Y = _to_pixel $Y, $H, $self->{h};
2837
2838 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2839 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2840 3520
2841 $child->configure ($X, $Y, $W, $H); 3521 $child->configure ($X, $Y, $W, $H);
2842 } 3522 }
2843} 3523}
2844 3524
… …
2855} 3535}
2856 3536
2857sub update { 3537sub update {
2858 my ($self) = @_; 3538 my ($self) = @_;
2859 3539
2860 $self->check_size;
2861 $::WANT_REFRESH++; 3540 $::WANT_REFRESH++;
2862} 3541}
2863 3542
2864sub add { 3543sub add {
2865 my ($self, @children) = @_; 3544 my ($self, @children) = @_;
2866 3545
2867 for my $child (@children) {
2868 $child->{toplevel} = 1; 3546 $_->{is_toplevel} = 1
2869 3547 for @children;
2870 # integerise window positions
2871 $child->{x} = int $child->{x};
2872 $child->{y} = int $child->{y};
2873 }
2874 3548
2875 $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 }
2876} 3565}
2877 3566
2878sub on_refresh { 3567sub on_refresh {
2879 my ($self, $id, $cb) = @_; 3568 my ($self, $id, $cb) = @_;
2880 3569
… …
2893 while ($self->{refresh_hook}) { 3582 while ($self->{refresh_hook}) {
2894 $_->() 3583 $_->()
2895 for values %{delete $self->{refresh_hook}}; 3584 for values %{delete $self->{refresh_hook}};
2896 } 3585 }
2897 3586
2898 if ($self->{check_size}) { 3587 if ($self->{realloc}) {
2899 my @queue = ([], []); 3588 my %queue;
3589 my @queue;
3590 my $widget;
2900 3591
2901 for (;;) { 3592 outer:
2902 if ($self->{check_size}) { 3593 while () {
2903 # heuristic: check containers last 3594 if (my $realloc = delete $self->{realloc}) {
2904 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3595 for $widget (values %$realloc) {
2905 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 }
2906 } 3602 }
2907 3603
2908 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3604 while () {
3605 @queue or last outer;
2909 3606
2910 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3607 $widget = pop @{ $queue[-1] || [] }
2911 ? @$widget{qw(user_w user_h)} 3608 and last;
2912 : $widget->size_request;
2913
2914 if (delete $widget->{force_alloc}
2915 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2916 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2917 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}) {
2918 $widget->{req_w} = $w; 3625 $widget->{req_w} = $w;
2919 $widget->{req_h} = $h; 3626 $widget->{req_h} = $h;
2920 3627
2921 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3628 $self->{size_alloc}{$widget+0} = $widget;
2922 3629
2923 $widget->{parent}->check_size
2924 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 }
2925 } 3637 }
3638
3639 delete $self->{realloc}{$widget+0};
2926 } 3640 }
2927 } 3641 }
2928 3642
2929 while ($self->{size_alloc}) { 3643 while (my $size_alloc = delete $self->{size_alloc}) {
2930 for (values %{delete $self->{size_alloc}}) { 3644 my @queue = sort { $b->{visible} <=> $a->{visible} }
2931 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)};
2932 3651
2933 $w = 0 if $w < 0; 3652 $w = 0 if $w < 0;
2934 $h = 0 if $h < 0; 3653 $h = 0 if $h < 0;
2935 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
2936 $widget->{w} = $w; 3662 $widget->{w} = $w;
2937 $widget->{h} = $h; 3663 $widget->{h} = $h;
2938 $widget->size_allocate ($w, $h); 3664
2939 $widget->emit (size_allocate => $w, $h); 3665 $widget->emit (size_allocate => $w, $h);
3666 }
2940 } 3667 }
2941 } 3668 }
2942 3669
2943 while ($self->{post_alloc_hook}) { 3670 while ($self->{post_alloc_hook}) {
2944 $_->() 3671 $_->()
2945 for values %{delete $self->{post_alloc_hook}}; 3672 for values %{delete $self->{post_alloc_hook}};
2946 } 3673 }
2947 3674
3675
2948 glViewport 0, 0, $::WIDTH, $::HEIGHT; 3676 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2949 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 3677 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2950 glClear GL_COLOR_BUFFER_BIT; 3678 glClear GL_COLOR_BUFFER_BIT;
2951 3679
2952 glMatrixMode GL_PROJECTION; 3680 glMatrixMode GL_PROJECTION;
2953 glLoadIdentity; 3681 glLoadIdentity;
2954 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 3682 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2955 glMatrixMode GL_MODELVIEW; 3683 glMatrixMode GL_MODELVIEW;
2956 glLoadIdentity; 3684 glLoadIdentity;
2957 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
2958 $self->_draw; 3693 $self->_draw;
2959} 3694}
2960 3695
2961############################################################################# 3696#############################################################################
2962 3697
2963package CFClient::UI; 3698package CFClient::UI;
2964 3699
2965$ROOT = new CFClient::UI::Root; 3700$ROOT = new CFClient::UI::Root;
2966$TOOLTIP = new CFClient::UI::Tooltip; 3701$TOOLTIP = new CFClient::UI::Tooltip z => 900;
2967 3702
29681 37031
2969 3704

Diff Legend

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