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.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.278 by root, Sun Jun 4 23:05:06 2006 UTC

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

Diff Legend

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