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

Diff Legend

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