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.220 by root, Mon May 22 03:28:55 2006 UTC vs.
Revision 1.311 by root, Fri Jun 23 22:35:16 2006 UTC

… …
3use utf8; 3use utf8;
4use strict; 4use strict;
5 5
6use Scalar::Util (); 6use Scalar::Util ();
7use List::Util (); 7use List::Util ();
8use Event;
8 9
9use CFClient; 10use CFClient;
11use CFClient::Texture;
10 12
11our ($FOCUS, $HOVER, $GRAB); # various widgets 13our ($FOCUS, $HOVER, $GRAB); # various widgets
12 14
15our $LAYOUT;
13our $ROOT; 16our $ROOT;
14our $TOOLTIP; 17our $TOOLTIP;
15our $BUTTON_STATE; 18our $BUTTON_STATE;
16 19
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
20 if (!$GRAB) { 23 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 24 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 25 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 26 if ($TOOLTIP->{owner} != $widget) {
27 $TOOLTIP->hide;
28
25 $TOOLTIP->{owner} = $widget; 29 $TOOLTIP->{owner} = $widget;
30
31 return if $ENV{CFPLUS_DEBUG} & 8;
26 32
27 my $tip = $widget->{tooltip}; 33 my $tip = $widget->{tooltip};
28 34
29 $tip = $tip->($widget) if CODE:: eq ref $tip; 35 $tip = $tip->($widget) if CODE:: eq ref $tip;
30 36
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $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 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
50 delete $TOOLTIP->{owner}; 47 delete $TOOLTIP->{owner};
48});
49
50sub get_layout {
51 my $layout;
52
53 for (grep { $_->{name} } values %WIDGET) {
54 my $win = $layout->{$_->{name}} = { };
55
56 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
57 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
58 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
59 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
60
61 $win->{show} = $_->{visible} && $_->{is_toplevel};
62 }
63
64 $layout
65}
66
67sub set_layout {
68 my ($layout) = @_;
69
70 $LAYOUT = $layout;
51} 71}
52 72
53# class methods for events 73# class methods for events
54sub feed_sdl_key_down_event { 74sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0]) 75 $FOCUS->emit (key_down => $_[0])
56 if $FOCUS; 76 if $FOCUS;
57} 77}
58 78
59sub feed_sdl_key_up_event { 79sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0]) 80 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 81 if $FOCUS;
62} 82}
63 83
64sub feed_sdl_button_down_event { 84sub feed_sdl_button_down_event {
65 my ($ev) = @_; 85 my ($ev) = @_;
… …
69 my $widget = $ROOT->find_widget ($x, $y); 89 my $widget = $ROOT->find_widget ($x, $y);
70 90
71 $GRAB = $widget; 91 $GRAB = $widget;
72 $GRAB->update if $GRAB; 92 $GRAB->update if $GRAB;
73 93
74 check_tooltip; 94 $TOOLTIP_WATCHER->cb->();
75 } 95 }
76 96
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 97 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
78 98
79 if ($GRAB) { 99 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
80 ($x, $y) = $GRAB->coord2local ($x, $y); 100 if $GRAB;
81 $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
82 }
83} 101}
84 102
85sub feed_sdl_button_up_event { 103sub feed_sdl_button_up_event {
86 my ($ev) = @_; 104 my ($ev) = @_;
87 my ($x, $y) = ($ev->{x}, $ev->{y}); 105 my ($x, $y) = ($ev->{x}, $ev->{y});
88 106
89 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 107 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
90 108
91 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 109 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
92 110
93 if ($GRAB) { 111 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y))
94 ($x, $y) = $GRAB->coord2local ($x, $y); 112 if $GRAB;
95 $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
96 }
97 113
98 if (!$BUTTON_STATE) { 114 if (!$BUTTON_STATE) {
99 my $grab = $GRAB; undef $GRAB; 115 my $grab = $GRAB; undef $GRAB;
100 $grab->update if $grab; 116 $grab->update if $grab;
101 $GRAB->update if $GRAB; 117 $GRAB->update if $GRAB;
102 118
103 check_tooltip; 119 $TOOLTIP_WATCHER->cb->();
104 } 120 }
105} 121}
106 122
107sub feed_sdl_motion_event { 123sub feed_sdl_motion_event {
108 my ($ev) = @_; 124 my ($ev) = @_;
… …
114 my $hover = $HOVER; $HOVER = $widget; 130 my $hover = $HOVER; $HOVER = $widget;
115 131
116 $hover->update if $hover && $hover->{can_hover}; 132 $hover->update if $hover && $hover->{can_hover};
117 $HOVER->update if $HOVER && $HOVER->{can_hover}; 133 $HOVER->update if $HOVER && $HOVER->{can_hover};
118 134
119 check_tooltip; 135 $TOOLTIP_WATCHER->start;
120 } 136 }
121 137
122 if ($HOVER) {
123 ($x, $y) = $HOVER->coord2local ($x, $y);
124 $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y); 138 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
125 } 139 if $HOVER;
126} 140}
127 141
128# convert position array to integers 142# convert position array to integers
129sub harmonize { 143sub harmonize {
130 my ($vals) = @_; 144 my ($vals) = @_;
… …
144 158
145 $_->update 159 $_->update
146 for @widgets; 160 for @widgets;
147} 161}
148 162
163sub reconfigure_widgets {
164 # make a copy, otherwise C<for> complains about freed values.
165 my @widgets = values %WIDGET;
166
167 $_->reconfigure
168 for @widgets;
169}
170
149# call when resolution changes etc. 171# call when resolution changes etc.
150sub rescale_widgets { 172sub rescale_widgets {
151 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
152 174
153 # make a copy, otherwise for complains about freed values.
154 my @widgets = values %WIDGET; 175 for my $widget (values %WIDGET) {
155
156 for my $widget (@widgets) {
157 if ($widget->{toplevel}) { 176 if ($widget->{is_toplevel}) {
177 $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
178 $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
179
158 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 180 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
159 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 181 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
160 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 182 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
161 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
162 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
163 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
164 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
165 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 186
187 $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
188 $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
189
166 } 190 }
167
168 $widget->reconfigure;
169 } 191 }
192
193 reconfigure_widgets;
170} 194}
171 195
172############################################################################# 196#############################################################################
173 197
174package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
179 203
180sub new { 204sub new {
181 my $class = shift; 205 my $class = shift;
182 206
183 my $self = bless { 207 my $self = bless {
184 x => 0, 208 x => "center",
185 y => 0, 209 y => "center",
186 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
187 can_events => 1, 213 can_events => 1,
188 @_ 214 @_
189 }, $class; 215 }, $class;
190 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
191 for (keys %$self) { 219 for (keys %$self) {
192 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
193 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
194 } 222 }
195 } 223 }
196 224
197 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 225 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
226 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
227 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
228 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
229 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
230
231 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
232 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
233
234 $self->show if $layout->{show};
235 }
198 236
199 $self 237 $self
200} 238}
201 239
202sub destroy { 240sub destroy {
… …
212 return if $self->{parent}; 250 return if $self->{parent};
213 251
214 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
215} 253}
216 254
217sub hide { 255sub set_visible {
218 my ($self) = @_; 256 my ($self) = @_;
257
258 return if $self->{visible};
259
260 $self->{root} = $self->{parent}{root};
261 $self->{visible} = $self->{parent}{visible} + 1;
262
263 $self->emit (visibility_change => 1);
264
265 $self->realloc if !exists $self->{req_w};
266
267 $_->set_visible for $self->children;
268}
269
270sub set_invisible {
271 my ($self) = @_;
272
273 return unless $self->{visible};
274
275 $_->set_invisible for $self->children;
276
277 delete $self->{visible};
278 delete $self->{root};
219 279
220 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
221 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
222 282
283 $CFClient::UI::TOOLTIP_WATCHER->cb->()
284 if $TOOLTIP->{owner} == $self;
285
286 $self->emit ("focus_out");
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
223 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
224 if $self->{parent}; 313 if $self->{parent};
225} 314}
226 315
227sub move { 316sub move_abs {
228 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
229 318
230 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
231 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
232 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
233 322
234 $self->update; 323 $self->update;
235} 324}
236 325
237sub set_size { 326sub set_size {
238 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
239 328
240 $self->{user_w} = $w; 329 $self->{force_w} = $w;
241 $self->{user_h} = $h; 330 $self->{force_h} = $h;
242 331
243 $self->check_size; 332 $self->realloc;
244} 333}
245 334
246sub size_request { 335sub size_request {
247 require Carp; 336 require Carp;
248 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
249} 338}
250 339
340sub baseline_shift {
341 0
342}
343
251sub configure { 344sub configure {
252 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
253 346
254 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
255 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
256 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
257 352
258 # use alignment to adjust x, y 353 # use alignment to adjust x, y
259 354
260 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
261 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
262
263 ($w, $h) = ($w2, $h2);
264 } 357 }
265 358
266 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
267 $self->{x} = $x; 360 $self->{x} = $x;
268 $self->{y} = $y; 361 $self->{y} = $y;
269 $self->update; 362 $self->update;
270 } 363 }
271 364
272 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
273 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
274 }
275}
276 367
277sub size_allocate { 368 $self->{alloc_w} = $w;
278 # nothing to be done 369 $self->{alloc_h} = $h;
279}
280 370
281sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
282 my ($self) = @_; 372 }
283
284 $self->check_size (1);
285 $self->update;
286} 373}
287 374
288sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
289} 381}
290 382
291sub set_max_size { 383sub set_max_size {
292 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
293 385
294 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
295 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
296} 390}
297 391
298sub set_tooltip { 392sub set_tooltip {
299 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
300 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
301 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
302 401
303 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
304 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
305 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
306 } 405 }
307} 406}
308 407
309# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
310sub coord2local { 409sub coord2local {
… …
318 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
319 418
320 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
321} 420}
322 421
323sub focus_in { 422sub invoke_focus_in {
324 my ($self) = @_; 423 my ($self) = @_;
325 424
326 return if $FOCUS == $self; 425 return if $FOCUS == $self;
327 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
328 427
329 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
330 429
331 $self->emit (focus_in => $focus);
332
333 $focus->update if $focus; 430 $focus->update if $focus;
334 $FOCUS->update; 431 $FOCUS->update;
335}
336 432
433 0
434}
435
337sub focus_out { 436sub invoke_focus_out {
338 my ($self) = @_; 437 my ($self) = @_;
339 438
340 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
341 440
342 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
343 442
344 $self->emit (focus_out => $focus);
345
346 $focus->update if $focus; #? 443 $focus->update if $focus; #?
347}
348 444
445 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
446 unless $FOCUS;
447
448 0
449}
450
451sub grab_focus {
452 my ($self) = @_;
453
454 $self->emit ("focus_in");
455}
456
349sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
350sub button_up { } 458sub invoke_button_up { 1 }
351sub key_down { } 459sub invoke_key_down { 1 }
352sub key_up { } 460sub invoke_key_up { 1 }
353 461
354sub button_down { 462sub invoke_button_down {
355 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
356 464
357 $self->focus_in; 465 $self->grab_focus;
358}
359 466
360sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
361sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
362sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
363sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
364sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 471 my ($self, $signal, $cb) = @_;
472
473 push @{ $self->{signal_cb}{$signal} }, $cb;
474}
475
476sub emit {
477 my ($self, $signal, @args) = @_;
478
479 #d##TODO# stop propagating at first true, do not use sum
480 (List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}) # before
481 || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args) # closure
482 || ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
483}
484
485sub find_widget {
486 my ($self, $x, $y) = @_;
487
488 return () unless $self->{can_events};
489
490 return $self
491 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
492 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
493
494 ()
495}
496
497sub set_parent {
498 my ($self, $parent) = @_;
499
500 Scalar::Util::weaken ($self->{parent} = $parent);
501 $self->set_visible if $parent->{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
365 535
366sub draw { 536sub draw {
367 my ($self) = @_; 537 my ($self) = @_;
368 538
369 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);
370 550
371 glPushMatrix; 551 glPushMatrix;
372 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
373 $self->_draw;
374 glPopMatrix;
375 553
376 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
377 my ($x, $y) = @$self{qw(x y)};
378
379 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
380 glEnable GL_BLEND; 556 glEnable GL_BLEND;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
382 glBegin GL_QUADS; 558 glBegin GL_QUADS;
383 glVertex $x , $y;
384 glVertex $x + $self->{w}, $y;
385 glVertex $x + $self->{w}, $y + $self->{h};
386 glVertex $x , $y + $self->{h};
387 glEnd;
388 glDisable GL_BLEND;
389 }
390
391 if ($ENV{PCLIENT_DEBUG}) {
392 glPushMatrix;
393 glColor 1, 1, 0, 1;
394 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
395 glBegin GL_LINE_LOOP;
396 glVertex 0 , 0; 559 glVertex 0 , 0;
397 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
398 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
399 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
400 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;
401 glPopMatrix; 577 glPopMatrix;
402 #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;
403 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
404} 583}
405 584
406sub _draw { 585sub _draw {
407 my ($self) = @_; 586 my ($self) = @_;
408 587
409 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
410} 589}
411 590
412sub find_widget {
413 my ($self, $x, $y) = @_;
414
415 return () unless $self->{can_events};
416
417 return $self
418 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
419 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
420
421 ()
422}
423
424sub set_parent {
425 my ($self, $parent) = @_;
426
427 Scalar::Util::weaken ($self->{parent} = $parent);
428
429 # TODO: req_w _does_change after ->reconfigure
430 $self->check_size
431 unless exists $self->{req_w};
432}
433
434sub check_size {
435 my ($self, $forced) = @_;
436
437 $self->{force_alloc} = 1 if $forced;
438 $CFClient::UI::ROOT->{check_size}{$self} = $self;
439}
440
441sub update {
442 my ($self) = @_;
443
444 $self->{parent}->update
445 if $self->{parent};
446}
447
448sub connect {
449 my ($self, $signal, $cb) = @_;
450
451 push @{ $self->{signal_cb}{$signal} }, $cb;
452}
453
454sub emit {
455 my ($self, $signal, @args) = @_;
456
457 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
458}
459
460sub DESTROY { 591sub DESTROY {
461 my ($self) = @_; 592 my ($self) = @_;
462 593
463 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
464 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
465} 598}
466 599
467############################################################################# 600#############################################################################
468 601
469package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
494 627
495 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
496 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
497 630
498 glEnable GL_BLEND; 631 glEnable GL_BLEND;
499 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
500 glColor @$color; 633 glColor_premultiply @$color;
501 634
502 glBegin GL_QUADS; 635 glBegin GL_QUADS;
503 glVertex 0 , 0; 636 glVertex 0 , 0;
504 glVertex 0 , $h; 637 glVertex 0 , $h;
505 glVertex $w, $h; 638 glVertex $w, $h;
… …
520 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
521 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
522} 655}
523 656
524sub size_request { 657sub size_request {
525 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
526} 661}
527 662
528sub draw { } 663sub draw { }
529 664
530############################################################################# 665#############################################################################
… …
534our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
535 670
536sub new { 671sub new {
537 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
538 673
539 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
540 675
541 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
542 children => [], 677 children => [],
543 can_events => 0, 678 can_events => 0,
544 %arg, 679 %arg,
545 ); 680 );
681
546 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
547 684
548 $self 685 $self
549} 686}
550 687
551sub add { 688sub add {
… …
559 $self->{children} = [ 696 $self->{children} = [
560 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
561 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
562 ]; 699 ];
563 700
564 $self->check_size (1); 701 $self->realloc;
565 $self->update;
566} 702}
567 703
568sub children { 704sub children {
569 @{ $_[0]{children} } 705 @{ $_[0]{children} }
570} 706}
… …
575 delete $child->{parent}; 711 delete $child->{parent};
576 $child->hide; 712 $child->hide;
577 713
578 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
579 715
580 $self->check_size; 716 $self->realloc;
581 $self->update;
582} 717}
583 718
584sub clear { 719sub clear {
585 my ($self) = @_; 720 my ($self) = @_;
586 721
… …
590 for (@$children) { 725 for (@$children) {
591 delete $_->{parent}; 726 delete $_->{parent};
592 $_->hide; 727 $_->hide;
593 } 728 }
594 729
595 $self->check_size; 730 $self->realloc;
596 $self->update;
597} 731}
598 732
599sub find_widget { 733sub find_widget {
600 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
601 735
602 $x -= $self->{x}; 736 $x -= $self->{x};
603 $y -= $self->{y}; 737 $y -= $self->{y};
604 738
605 my $res; 739 my $res;
606 740
607 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
608 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
609 and return $res; 743 and return $res;
610 } 744 }
611 745
612 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
633} 767}
634 768
635sub add { 769sub add {
636 my ($self, $child) = @_; 770 my ($self, $child) = @_;
637 771
638 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
639
640 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
641} 774}
642 775
643sub remove { 776sub remove {
644 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
653 786
654sub size_request { 787sub size_request {
655 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
656} 789}
657 790
658sub size_allocate { 791sub invoke_size_allocate {
659 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
660 793
661 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
662} 797}
663 798
664############################################################################# 799#############################################################################
800
801# back-buffered drawing area
665 802
666package CFClient::UI::Window; 803package CFClient::UI::Window;
667 804
668our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
669 806
… …
680 817
681 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
682 $self->SUPER::update; 819 $self->SUPER::update;
683} 820}
684 821
685sub size_allocate { 822sub invoke_size_allocate {
686 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
687 824
688 $self->SUPER::size_allocate ($w, $h);
689 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
690} 828}
691 829
692sub _render { 830sub _render {
831 my ($self) = @_;
832
693 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
694} 834}
695 835
696sub render_child { 836sub render_child {
697 my ($self) = @_; 837 my ($self) = @_;
698 838
699 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 839 $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
700 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
701 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
702 842
843 {
844 package CFClient::UI::Base;
845
846 ($draw_x, $draw_y, $draw_w, $draw_h) =
847 (0, 0, $self->{w}, $self->{h});
848 }
849
703 $self->_render; 850 $self->_render;
704 }; 851 };
705} 852}
706 853
707sub _draw { 854sub _draw {
708 my ($self) = @_; 855 my ($self) = @_;
709 856
710 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
711 858
712 my $tex = $self->{texture} 859 my $tex = $self->{texture}
713 or return; 860 or return;
714 861
715 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
716 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 863 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
717 glColor 1, 1, 1, 1; 864 glColor 0, 0, 0, 1;
718 865
719 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 866 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
720 867
721 glDisable GL_TEXTURE_2D; 868 glDisable GL_TEXTURE_2D;
722} 869}
… …
725 872
726package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
727 874
728our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
729 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
730sub size_request { 887sub size_request {
731 my ($self) = @_; 888 my ($self) = @_;
732 889
733 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
734 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
735 891
736 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
737} 893 $h = 10 if $self->{scroll_y};
738 894
895 ($w, $h)
896}
897
739sub size_allocate { 898sub invoke_size_allocate {
740 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
741 900
901 my $child = $self->child;
902
903 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
904 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
905
906 $self->child->configure (0, 0, $w, $h);
742 $self->update; 907 $self->update;
908
909 1
743} 910}
744 911
745sub set_offset { 912sub set_offset {
746 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
747 914
… …
780} 947}
781 948
782sub _render { 949sub _render {
783 my ($self) = @_; 950 my ($self) = @_;
784 951
952 local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
953 local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
954
785 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
786 956
787 $self->SUPER::_render; 957 $self->SUPER::_render;
788} 958}
789 959
… …
792package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
793 963
794our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
795 965
796sub new { 966sub new {
797 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
798 970
799 my $self; 971 my $self;
800 972
801 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
802 vertical => 1, 974 vertical => 1,
803 range => [0, 0, 1, 0.01], # HACK fix 975 range => [0, 0, 1, 0.01], # HACK fix
804 connect_changed => sub { 976 on_changed => sub {
805 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 977 $self->{vp}->set_offset (0, $_[1]);
806 }, 978 },
807 ; 979 ;
808 980
809 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
810 vp => (new CFClient::UI::ViewPort expand => 1), 982 vp => (new CFClient::UI::ViewPort expand => 1),
811 slider => $slider, 983 slider => $slider,
812 @_, 984 %arg,
813 ); 985 );
814 986
815 $self->{vp}->add ($self->{scrolled});
816 $self->add ($self->{vp});
817 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
818 989
819 $self 990 $self
991}
992
993sub add {
994 my ($self, $widget) = @_;
995
996 $self->{vp}->add ($self->{child} = $widget);
997}
998
999sub update {
1000 my ($self) = @_;
1001
1002 $self->SUPER::update;
1003
1004 # todo: overwrite size_allocate of child
1005 my $child = $self->{vp}->child;
1006 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1007}
1008
1009sub invoke_size_allocate {
1010 my ($self, $w, $h) = @_;
1011
1012 my $child = $self->{vp}->child;
1013 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
1014
1015 $self->SUPER::invoke_size_allocate ($w, $h)
820} 1016}
821 1017
822#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
823# update viewport offset on scroll 1019# update viewport offset on scroll
824 1020
… …
844 1040
845 if ($self->{bg}) { 1041 if ($self->{bg}) {
846 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
847 1043
848 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
849 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
850 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
851 1047
852 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
853 glVertex 0 , 0; 1049 glVertex 0 , 0;
854 glVertex 0 , $h; 1050 glVertex 0 , $h;
855 glVertex $w, $h; 1051 glVertex $w, $h;
… …
868 1064
869our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
870 1066
871use CFClient::OpenGL; 1067use CFClient::OpenGL;
872 1068
873my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
874 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
875 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
876 1076
877sub new { 1077sub new {
878 my $class = shift; 1078 my ($class, %arg) = @_;
879
880 # TODO: user_x, user_y, overwrite moveto?
881 1079
882 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
883 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
884 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
885 border => 0.6, 1083 border => 0.6,
886 toplevel => 1,
887 can_events => 1, 1084 can_events => 1,
888 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
889 ); 1088 );
890 1089
891 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
892 align => 0, 1091 align => 0,
893 valign => 1, 1092 valign => 1,
894 text => $self->{title}, 1093 text => $self->{title},
895 fontsize => $self->{border}; 1094 fontsize => $self->{border},
1095 if exists $self->{title};
1096
1097 if ($self->{has_close_button}) {
1098 $self->{close_button} =
1099 new CFClient::UI::ImageButton
1100 path => 'x1_close.png',
1101 on_activate => sub { $self->hide };
1102
1103 $self->CFClient::UI::Container::add ($self->{close_button});
1104 }
896 1105
897 $self 1106 $self
1107}
1108
1109sub add {
1110 my ($self, @widgets) = @_;
1111
1112 $self->SUPER::add (@widgets);
1113 $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
1114 $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
898} 1115}
899 1116
900sub border { 1117sub border {
901 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
902} 1119}
903 1120
904sub size_request { 1121sub size_request {
905 my ($self) = @_; 1122 my ($self) = @_;
1123
1124 $self->{title_widget}->size_request
1125 if $self->{title_widget};
1126
1127 $self->{close_button}->size_request
1128 if $self->{close_button};
906 1129
907 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
908 1131
909 ( 1132 (
910 $w + $self->border * 2, 1133 $w + $self->border * 2,
911 $h + $self->border * 2, 1134 $h + $self->border * 2,
912 ) 1135 )
913} 1136}
914 1137
915sub size_allocate { 1138sub invoke_size_allocate {
916 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
917 1140
1141 if ($self->{title_widget}) {
1142 $self->{title_widget}{w} = $w;
1143 $self->{title_widget}{h} = $h;
1144 $self->{title_widget}->invoke_size_allocate ($w, $h);
1145 }
1146
1147 my $border = $self->border;
1148
918 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
919 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
920 1151
921 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
922 if $self->{title};
923
924 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
925}
926 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
927sub button_down { 1160sub invoke_button_down {
928 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
929 1162
930 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
931 my $border = $self->border; 1164 my $border = $self->border;
932 1165
… …
945 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
946 1179
947 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
948 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
949 1182
950 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
951 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
952 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
953 $self->check_size; 1187 $self->realloc;
954 }; 1188 };
955 1189
956 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
957 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
958 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
960 $self->{motion} = sub { 1194 $self->{motion} = sub {
961 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
962 1196
963 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
964 1198
965 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
966 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
967 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
968 } 1207 1
969} 1208}
970 1209
971sub button_up { 1210sub invoke_button_up {
972 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
973 1212
974 delete $self->{motion}; 1213 ! ! delete $self->{motion}
975} 1214}
976 1215
977sub mouse_motion { 1216sub invoke_mouse_motion {
978 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
979 1218
980 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
981} 1222}
982 1223
983sub _draw { 1224sub _draw {
984 my ($self) = @_; 1225 my ($self) = @_;
985 1226
1227 my $child = $self->{children}[0];
1228
986 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
987 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
988 1231
989 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
990 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
991 1234
992 my $border = $self->border; 1235 my $border = $self->border;
993 1236
994 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
995 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
996 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
997 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
998 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
999 1242
1000 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1001 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
1002 1245
1003 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1004 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1005 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
1006
1007 glColor @{ $self->{bg} };
1008
1009 $bg->{s} = $rep_x;
1010 $bg->{t} = $rep_y;
1011 $bg->{wrap_mode} = 1;
1012 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1013 } 1251 }
1014 1252
1015 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1016 1254
1017 $self->{title}->draw if $self->{title};
1018
1019 $self->child->draw; 1255 $child->draw;
1256
1257 if ($self->{title_widget}) {
1258 glTranslate 0, $border - $self->{h};
1259 $self->{title_widget}->_draw;
1260
1261 glTranslate 0, - ($border - $self->{h});
1262 }
1263
1264 $self->{close_button}->draw
1265 if $self->{close_button};
1020} 1266}
1021 1267
1022############################################################################# 1268#############################################################################
1023 1269
1024package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1032sub new { 1278sub new {
1033 my $class = shift; 1279 my $class = shift;
1034 1280
1035 $class->SUPER::new ( 1281 $class->SUPER::new (
1036 col_expand => [], 1282 col_expand => [],
1037 @_ 1283 @_,
1038 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1039} 1289}
1040 1290
1041sub add { 1291sub add {
1042 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1043 1293
1044 $child->set_parent ($self); 1294 $child->set_parent ($self);
1045 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1046 1296
1047 $child->check_size; 1297 $self->realloc;
1048} 1298}
1049 1299
1050sub children { 1300sub remove {
1051 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1052}
1053 1302
1303 # TODO: not yet implemented
1304}
1305
1054# TODO: move to container class maybe? send childs a signal on removal? 1306# TODO: move to container class maybe? send children a signal on removal?
1055sub clear { 1307sub clear {
1056 my ($self) = @_; 1308 my ($self) = @_;
1057 1309
1058 my @children = $self->children; 1310 my @children = $self->children;
1059 delete $self->{children}; 1311 delete $self->{children};
… …
1061 for (@children) { 1313 for (@children) {
1062 delete $_->{parent}; 1314 delete $_->{parent};
1063 $_->hide; 1315 $_->hide;
1064 } 1316 }
1065 1317
1066 $self->update; 1318 $self->realloc;
1067} 1319}
1068 1320
1069sub get_wh { 1321sub get_wh {
1070 my ($self) = @_; 1322 my ($self) = @_;
1071 1323
… …
1097 (sum @$ws), 1349 (sum @$ws),
1098 (sum @$hs), 1350 (sum @$hs),
1099 ) 1351 )
1100} 1352}
1101 1353
1102sub size_allocate { 1354sub invoke_size_allocate {
1103 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1104 1356
1105 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1106 1358
1107 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1108 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1109 1361
1110 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1111 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1112 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1113 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1139 } 1391 }
1140 1392
1141 $y += $row_h; 1393 $y += $row_h;
1142 } 1394 }
1143 1395
1396 1
1144} 1397}
1145 1398
1146sub find_widget { 1399sub find_widget {
1147 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1148 1401
… …
1167 } 1420 }
1168} 1421}
1169 1422
1170############################################################################# 1423#############################################################################
1171 1424
1425package CFClient::UI::Box;
1426
1427our @ISA = CFClient::UI::Container::;
1428
1429sub size_request {
1430 my ($self) = @_;
1431
1432 $self->{vertical}
1433 ? (
1434 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1435 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1436 )
1437 : (
1438 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1439 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1440 )
1441}
1442
1443sub invoke_size_allocate {
1444 my ($self, $w, $h) = @_;
1445
1446 my $space = $self->{vertical} ? $h : $w;
1447 my @children = $self->visible_children;
1448
1449 my @req;
1450
1451 if ($self->{homogeneous}) {
1452 @req = ($space / (@children || 1)) x @children;
1453 } else {
1454 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1455 my $req = List::Util::sum @req;
1456
1457 if ($req > $space) {
1458 # ah well, not enough space
1459 $_ *= $space / $req for @req;
1460 } else {
1461 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1462
1463 $space = ($space - $req) / $expand; # remaining space to give away
1464
1465 $req[$_] += $space * $children[$_]{expand}
1466 for 0 .. $#children;
1467 }
1468 }
1469
1470 CFClient::UI::harmonize \@req;
1471
1472 my $pos = 0;
1473 for (0 .. $#children) {
1474 my $alloc = $req[$_];
1475 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1476
1477 $pos += $alloc;
1478 }
1479
1480 1
1481}
1482
1483#############################################################################
1484
1172package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1173 1486
1174# TODO: wrap into common Box base class
1175
1176our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1177 1488
1178sub size_request { 1489sub new {
1179 my ($self) = @_; 1490 my $class = shift;
1180 1491
1181 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1182 1493 vertical => 0,
1183 ( 1494 @_,
1184 (List::Util::sum map $_->[0], @alloc),
1185 (List::Util::max map $_->[1], @alloc),
1186 ) 1495 )
1187} 1496}
1188 1497
1189sub size_allocate {
1190 my ($self, $w, $h) = @_;
1191
1192 ($h, $w) = ($w, $h);
1193
1194 my $children = $self->{children};
1195
1196 my @h = map $_->{req_w}, @$children;
1197
1198 my $req_h = List::Util::sum @h;
1199
1200 if ($req_h > $h) {
1201 # ah well, not enough space
1202 $_ *= $h / $req_h for @h;
1203 } else {
1204 my $exp = List::Util::sum map $_->{expand}, @$children;
1205 $exp ||= 1;
1206
1207 for (0 .. $#$children) {
1208 my $child = $children->[$_];
1209
1210 my $alloc_h = $h[$_];
1211 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1212 $h[$_] = $alloc_h;
1213 }
1214 }
1215
1216 CFClient::UI::harmonize \@h;
1217
1218 my $y = 0;
1219 for (0 .. $#$children) {
1220 my $child = $children->[$_];
1221 my $h = $h[$_];
1222 $child->configure ($y, 0, $h, $w);
1223
1224 $y += $h;
1225 }
1226
1227 1
1228}
1229
1230############################################################################# 1498#############################################################################
1231 1499
1232package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1233 1501
1234# TODO: wrap into common Box base class
1235
1236our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1237 1503
1238sub size_request { 1504sub new {
1239 my ($self) = @_; 1505 my $class = shift;
1240 1506
1241 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1242 1508 vertical => 1,
1243 ( 1509 @_,
1244 (List::Util::max map $_->[0], @alloc),
1245 (List::Util::sum map $_->[1], @alloc),
1246 ) 1510 )
1247}
1248
1249sub size_allocate {
1250 my ($self, $w, $h) = @_;
1251
1252 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1253
1254 my $children = $self->{children};
1255
1256 my @h = map $_->{req_h}, @$children;
1257
1258 my $req_h = List::Util::sum @h;
1259
1260 if ($req_h > $h) {
1261 # ah well, not enough space
1262 $_ *= $h / $req_h for @h;
1263 } else {
1264 my $exp = List::Util::sum map $_->{expand}, @$children;
1265 $exp ||= 1;
1266
1267 for (0 .. $#$children) {
1268 my $child = $children->[$_];
1269
1270 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1271 }
1272 }
1273
1274 CFClient::UI::harmonize \@h;
1275
1276 my $y = 0;
1277 for (0 .. $#$children) {
1278 my $child = $children->[$_];
1279 my $h = $h[$_];
1280 $child->configure (0, $y, $w, $h);
1281
1282 $y += $h;
1283 }
1284
1285 1
1286} 1511}
1287 1512
1288############################################################################# 1513#############################################################################
1289 1514
1290package CFClient::UI::Label; 1515package CFClient::UI::Label;
… …
1307 ellipsise => 3, # end 1532 ellipsise => 3, # end
1308 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1309 fontsize => 1, 1534 fontsize => 1,
1310 align => -1, 1535 align => -1,
1311 valign => -1, 1536 valign => -1,
1312 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1313 can_events => 0, 1539 can_events => 0,
1314 %arg 1540 %arg
1315 ); 1541 );
1316 1542
1317 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1344 1570
1345 delete $self->{texture}; 1571 delete $self->{texture};
1346 $self->SUPER::update; 1572 $self->SUPER::update;
1347} 1573}
1348 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1349sub set_text { 1582sub set_text {
1350 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1351 1584
1352 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1353 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1354 1587
1355 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1356 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1357 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1358 $self->update; 1593 $self->update;
1359 $self->check_size;
1360} 1594}
1361 1595
1362sub set_markup { 1596sub set_markup {
1363 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1364 1598
… …
1368 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1369 1603
1370 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba; 1604 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1371 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1372 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1373 $self->update; 1609 $self->update;
1374 $self->check_size;
1375} 1610}
1376 1611
1377sub size_request { 1612sub size_request {
1378 my ($self) = @_; 1613 my ($self) = @_;
1379 1614
1615 $self->{size_req} ||= do {
1380 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1381 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1382 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1383 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1384 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1385 1621
1386 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1387 1623
1388 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1389 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1390 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1391 1627
1392 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1393 1629
1394 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1395 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1396 } 1635 };
1397 1636
1398 ( 1637 @{ $self->{size_req} }
1399 $w + $self->{padding} * 2,
1400 $h + $self->{padding} * 2,
1401 )
1402} 1638}
1403 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1404sub size_allocate { 1644sub invoke_size_allocate {
1405 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1406 1646
1647 delete $self->{ox};
1648
1407 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1408} 1653}
1409 1654
1410sub set_fontsize { 1655sub set_fontsize {
1411 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1412 1657
1413 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1414 delete $self->{texture}; 1659 delete $self->{texture};
1415 1660
1416 $self->update; 1661 $self->realloc;
1417 $self->check_size; 1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1418} 1670}
1419 1671
1420sub _draw { 1672sub _draw {
1421 my ($self) = @_; 1673 my ($self) = @_;
1422 1674
… …
1428 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1429 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1430 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1431 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1432 1684
1433 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1434 1687
1688 unless (exists $self->{ox}) {
1435 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1436 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1437 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1438 1692
1439 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1440 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1441 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1442
1443 $tex
1444 }; 1696 };
1445 1697
1446 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1447 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1699
1700 my $w = List::Util::min $self->{w} + 4, $tex->{w};
1701 my $h = List::Util::min $self->{h} + 2, $tex->{h};
1448 1702
1449 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1450 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1451 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1452 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1453 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1454 } 1710 }
1455 1711
1456 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1457} 1713}
1458 1714
… …
1474 active_fg => [0, 0, 0], 1730 active_fg => [0, 0, 0],
1475 can_hover => 1, 1731 can_hover => 1,
1476 can_focus => 1, 1732 can_focus => 1,
1477 valign => 0, 1733 valign => 0,
1478 can_events => 1, 1734 can_events => 1,
1735 #text => ...
1736 #hidden => "*",
1479 @_ 1737 @_
1480 ) 1738 )
1481} 1739}
1482 1740
1483sub _set_text { 1741sub _set_text {
… …
1485 1743
1486 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1487 1745
1488 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1489 1747
1490 delete $self->{texture};
1491
1492 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1493 $self->{text} = $text; 1749 $self->{text} = $text;
1494 1750
1495 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1496 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1497 1754
1498 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1499} 1759}
1500 1760
1501sub set_text { 1761sub set_text {
1502 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1503 1763
1504 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1505 $self->_set_text ($text); 1765 $self->_set_text ($text);
1506 $self->update;
1507 $self->check_size;
1508} 1766}
1509 1767
1510sub get_text { 1768sub get_text {
1511 $_[0]{text} 1769 $_[0]{text}
1512} 1770}
… …
1517 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1518 1776
1519 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1520} 1778}
1521 1779
1522sub size_allocate {
1523 my ($self, $w, $h) = @_;
1524
1525 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1526}
1527
1528sub key_down { 1780sub invoke_key_down {
1529 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1530 1782
1531 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1532 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1533 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1548 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1549 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1550 $self->emit ('escape'); 1802 $self->emit ('escape');
1551 } elsif ($uni) { 1803 } elsif ($uni) {
1552 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1553 } 1807 }
1554 1808
1555 $self->_set_text ($text); 1809 $self->_set_text ($text);
1556 $self->update;
1557 $self->check_size;
1558}
1559 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1560sub focus_in { 1816sub invoke_focus_in {
1561 my ($self) = @_; 1817 my ($self) = @_;
1562 1818
1563 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1564 1820
1565 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1566} 1822}
1567 1823
1568sub button_down { 1824sub invoke_button_down {
1569 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1570 1826
1571 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1572 1828
1573 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1574 1830
1575 # byte-index to char-index 1831 # byte-index to char-index
1576 my $text = $self->{text}; 1832 my $text = $self->{text};
1577 utf8::encode $text; 1833 utf8::encode $text;
1578 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1579 1835
1580 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1581 $self->update; 1837 $self->update;
1838
1839 1
1582} 1840}
1583 1841
1584sub mouse_motion { 1842sub invoke_mouse_motion {
1585 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1586# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1844# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1845
1846 1
1587} 1847}
1588 1848
1589sub _draw { 1849sub _draw {
1590 my ($self) = @_; 1850 my ($self) = @_;
1591 1851
1592 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1593 1853
1594 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1595 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1596 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1597 } else { 1857 } else {
1598 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1599 } 1859 }
1600 1860
1601 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1602 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1603 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1604 glVertex 0 , 0; 1864 glVertex 0 , 0;
1605 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1606 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1607 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1632 1892
1633our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1634 1894
1635use CFClient::OpenGL; 1895use CFClient::OpenGL;
1636 1896
1637sub key_down { 1897sub invoke_key_down {
1638 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1639 1899
1640 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1641 1901
1642 if ($sym == 13) { 1902 if ($sym == 13) {
1643 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1644 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1645 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1646 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1647 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1648 $self->update; 1909 $self->update;
1649 1910
… …
1668 } else { 1929 } else {
1669 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1670 } 1931 }
1671 1932
1672 } else { 1933 } else {
1673 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1674 } 1937 1
1675
1676} 1938}
1677 1939
1678############################################################################# 1940#############################################################################
1679 1941
1680package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1689 1951
1690sub new { 1952sub new {
1691 my $class = shift; 1953 my $class = shift;
1692 1954
1693 $class->SUPER::new ( 1955 $class->SUPER::new (
1694 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1695 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1696 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1697 can_hover => 1, 1960 can_hover => 1,
1698 align => 0, 1961 align => 0,
1699 valign => 0, 1962 valign => 0,
1700 can_events => 1, 1963 can_events => 1,
1701 @_ 1964 @_
1702 ) 1965 )
1703} 1966}
1704 1967
1705sub button_up { 1968sub invoke_button_up {
1706 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1707 1970
1971 $self->emit ("activate")
1708 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1709 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1710 $self->emit ("activate"); 1974
1711 } 1975 1
1712} 1976}
1713 1977
1714sub _draw { 1978sub _draw {
1715 my ($self) = @_; 1979 my ($self) = @_;
1716 1980
1717 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1718
1719 if ($GRAB == $self) {
1720 $self->{fg} = $self->{active_fg};
1721 }
1722 1982
1723 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1724 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1725 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1726 1986
… …
1731 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1732} 1992}
1733 1993
1734############################################################################# 1994#############################################################################
1735 1995
1996package CFClient::UI::ImageButton;
1997
1998our @ISA = CFClient::UI::Image::;
1999
2000use CFClient::OpenGL;
2001
2002my %textures;
2003
2004sub new {
2005 my $class = shift;
2006
2007 my $self = $class->SUPER::new (
2008 padding_x => 4,
2009 padding_y => 4,
2010 fg => [1, 1, 1],
2011 active_fg => [0, 0, 1],
2012 can_hover => 1,
2013 align => 0,
2014 valign => 0,
2015 can_events => 1,
2016 @_
2017 );
2018}
2019
2020sub invoke_button_up {
2021 my ($self, $ev, $x, $y) = @_;
2022
2023 $self->emit ("activate")
2024 if $x >= 0 && $x < $self->{w}
2025 && $y >= 0 && $y < $self->{h};
2026
2027 1
2028}
2029
2030#############################################################################
2031
1736package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1737 2033
1738our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1739 2035
1740my @tex = 2036my @tex =
… …
1745 2041
1746sub new { 2042sub new {
1747 my $class = shift; 2043 my $class = shift;
1748 2044
1749 $class->SUPER::new ( 2045 $class->SUPER::new (
1750 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1751 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1752 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1753 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1754 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1755 state => 0, 2052 state => 0,
… …
1759} 2056}
1760 2057
1761sub size_request { 2058sub size_request {
1762 my ($self) = @_; 2059 my ($self) = @_;
1763 2060
1764 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1765} 2062}
1766 2063
1767sub button_down { 2064sub invoke_button_down {
1768 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1769 2066
1770 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1771 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1772 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1773 $self->emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1774 } 2075 1
1775} 2076}
1776 2077
1777sub _draw { 2078sub _draw {
1778 my ($self) = @_; 2079 my ($self) = @_;
1779 2080
1780 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1781 2082
1782 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1783 2084
1784 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2085 my ($w, $h) = @$self{qw(w h)};
2086
2087 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1785 2088
1786 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1787 2090
1788 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1789 2092
… …
1797package CFClient::UI::Image; 2100package CFClient::UI::Image;
1798 2101
1799our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1800 2103
1801use CFClient::OpenGL; 2104use CFClient::OpenGL;
1802use Carp qw/confess/;
1803 2105
1804our %loaded_images; 2106our %texture_cache;
1805 2107
1806sub new { 2108sub new {
1807 my $class = shift; 2109 my $class = shift;
1808 2110
1809 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1810 2115
1811 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2116 $self->{path}
2117 or Carp::croak "required attribute 'path' not set";
1812 2118
1813 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1814 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2120 new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
1815 2121
1816 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1817 2123
1818 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1819
1820 $self->{aspect} = $tex->{w} / $tex->{h};
1821 2125
1822 $self 2126 $self
1823} 2127}
1824 2128
1825sub size_request { 2129sub size_request {
1826 my ($self) = @_; 2130 my ($self) = @_;
1827 2131
1828 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1829} 2133}
1830 2134
1831sub _draw { 2135sub _draw {
1832 my ($self) = @_; 2136 my ($self) = @_;
1833 2137
… …
1944 2248
1945 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
1946 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
1947 2251
1948 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
1949 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2253 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2254 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1950 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1951 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1952 2257
1953 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
1954 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2053 my $self = $class->SUPER::new ( 2358 my $self = $class->SUPER::new (
2054 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2055 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2056 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2057 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2058 range => [0, 0, 100, 10], 2363 range => [0, 0, 100, 10, 0],
2059 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2060 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2061 vertical => 0, 2366 vertical => 0,
2062 can_hover => 1, 2367 can_hover => 1,
2063 inner_pad => 0.02, 2368 inner_pad => 0.02,
2064 @_ 2369 @_
2065 ); 2370 );
… …
2068 $self->update; 2373 $self->update;
2069 2374
2070 $self 2375 $self
2071} 2376}
2072 2377
2378sub set_range {
2379 my ($self, $range) = @_;
2380
2381 ($range, $self->{range}) = ($self->{range}, $range);
2382
2383 if ("@$range" ne "@{$self->{range}}") {
2384 $self->update;
2385 $self->set_value ($self->{range}[0]);
2386 }
2387}
2388
2073sub set_value { 2389sub set_value {
2074 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2075 2391
2076 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2392 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2077 2393
2078 $hi = $lo + 1 if $hi <= $lo; 2394 $hi = $lo + 1 if $hi <= $lo;
2079 2395
2396 $page = $hi - $lo if $page > $hi - $lo;
2397
2080 $value = $lo if $value < $lo; 2398 $value = $lo if $value < $lo;
2081 $value = $hi if $value > $hi; 2399 $value = $hi - $page if $value > $hi - $page;
2082 2400
2083 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2401 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2084 if $unit; 2402 if $unit;
2085
2086 $page = $hi - $lo if $page > $hi - $lo;
2087 2403
2088 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2089 2405
2090 if ($value != $old_value) { 2406 if ($value != $old_value) {
2091 $self->emit (changed => $value); 2407 $self->emit (changed => $value);
… …
2094} 2410}
2095 2411
2096sub size_request { 2412sub size_request {
2097 my ($self) = @_; 2413 my ($self) = @_;
2098 2414
2099 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2100 my $h = $self->{req_h};
2101
2102 $self->{vertical} ? ($h, $w) : ($w, $h)
2103} 2416}
2104 2417
2105sub button_down { 2418sub invoke_button_down {
2106 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2107 2420
2108 $self->SUPER::button_down ($ev, $x, $y); 2421 $self->SUPER::invoke_button_down ($ev, $x, $y);
2422
2423 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2424
2109 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2110} 2426}
2111 2427
2112sub mouse_motion { 2428sub invoke_mouse_motion {
2113 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2114 2430
2115 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2116 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2117 2433
2118 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2119 2435
2120 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2121 2437
2122 $self->set_value ($x * ($hi - $lo) + $lo); 2438 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2439 } else {
2440 return 0;
2441 }
2442
2123 } 2443 1
2124} 2444}
2125 2445
2126sub update { 2446sub update {
2127 my ($self) = @_; 2447 my ($self) = @_;
2128 2448
2129 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 2449 delete $self->{knob_w};
2450 $self->SUPER::update;
2451}
2452
2453sub _draw {
2454 my ($self) = @_;
2455
2456 unless ($self->{knob_w}) {
2130 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2131 2458
2132 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2460 my $range = ($hi - $page - $lo) || 1e-100;
2133 2461
2134 my $inner_w = 1 - 2 * $self->{inner_pad}; 2462 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2135 2463
2136 $self->{scale} = ($inner_w / ($hi - $lo)) || 1; 2464 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2465 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2137 2466
2138 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2467 $value = ($value - $lo) / $range;
2139 $value = $self->{scale} * ($value - $lo); 2468 $value = $value * $self->{scale} + $self->{offset};
2140 2469
2141 $value = $self->{inner_pad} + ($value - $page * 0.5);
2142
2143 $value = 0 if $value < 0;
2144 $page = 1 - $value if $value + $page > 1;
2145
2146 $self->{knob_x} = $value; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2147 $self->{knob_w} = $page; 2471 $self->{knob_w} = $knob_w;
2148 }); 2472 }
2149
2150 $self->SUPER::update;
2151}
2152
2153sub _draw {
2154 my ($self) = @_;
2155 2473
2156 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2157 2475
2158 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2159 2477
… …
2179 glDisable GL_TEXTURE_2D; 2497 glDisable GL_TEXTURE_2D;
2180} 2498}
2181 2499
2182############################################################################# 2500#############################################################################
2183 2501
2502package CFClient::UI::ValSlider;
2503
2504our @ISA = CFClient::UI::HBox::;
2505
2506sub new {
2507 my ($class, %arg) = @_;
2508
2509 my $range = delete $arg{range};
2510
2511 my $self = $class->SUPER::new (
2512 slider => (new CFClient::UI::Slider expand => 1, range => $range),
2513 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),
2514 to_value => sub { shift },
2515 from_value => sub { shift },
2516 %arg,
2517 );
2518
2519 $self->{slider}->connect (changed => sub {
2520 my ($self, $value) = @_;
2521 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2522 $self->{parent}->emit (changed => $value);
2523 });
2524
2525# $self->{entry}->connect (changed => sub {
2526# my ($self, $value) = @_;
2527# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2528# $self->{parent}->emit (changed => $value);
2529# });
2530
2531 $self->add ($self->{slider}, $self->{entry});
2532
2533 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2534
2535 $self
2536}
2537
2538sub set_range { shift->{slider}->set_range (@_) }
2539sub set_value { shift->{slider}->set_value (@_) }
2540
2541#############################################################################
2542
2184package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2185 2544
2186our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2187 2546
2188use CFClient::OpenGL; 2547use CFClient::OpenGL;
2189 2548
… …
2191 my $class = shift; 2550 my $class = shift;
2192 2551
2193 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2194 fontsize => 1, 2553 fontsize => 1,
2195 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2196 #font => default_font 2556 #font => default_font
2197 @_, 2557 @_,
2198 2558
2199 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2200 par => [], 2560 par => [],
… …
2215 2575
2216 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2217 $self->reflow; 2577 $self->reflow;
2218} 2578}
2219 2579
2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2220sub size_allocate { 2586sub invoke_size_allocate {
2221 my ($self, $w, $h) = @_; 2587 my ($self, $w, $h) = @_;
2222 2588
2223 $self->SUPER::size_allocate ($w, $h); 2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2224 2591
2225 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2226 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2227 $self->{layout}->set_width ($self->{children}[0]{w}); 2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2228 2596
2229 $self->reflow; 2597 $self->reflow;
2230}
2231 2598
2232sub text_height { 2599 $self->SUPER::invoke_size_allocate ($w, $h)
2233 my ($self, $text, $indent) = @_; 2600}
2601
2602sub get_layout {
2603 my ($self, $para) = @_;
2234 2604
2235 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2236 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2237 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2238 $layout->set_width ($self->{children}[0]{w} - $indent); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2239 $layout->set_markup ($text); 2612 $layout->set_markup ($para->{markup});
2613
2614 $layout->set_shapes (
2615 map
2616 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2617 @{$para->{widget}}
2240 2618 );
2241 ($layout->size)[1] 2619
2620 $layout
2242} 2621}
2243 2622
2244sub reflow { 2623sub reflow {
2245 my ($self) = @_; 2624 my ($self) = @_;
2246 2625
2247 $self->{need_reflow}++; 2626 $self->{need_reflow}++;
2248 $self->update; 2627 $self->update;
2249} 2628}
2250 2629
2630sub set_offset {
2631 my ($self, $offset) = @_;
2632
2633 # todo: base offset on lines or so, not on pixels
2634 $self->{children}[1]->set_value ($offset);
2635}
2636
2637sub clear {
2638 my ($self) = @_;
2639
2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2642
2643 $self->{par} = [];
2644 $self->{height} = 0;
2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2646}
2647
2251sub add_paragraph { 2648sub add_paragraph {
2252 my ($self, $color, $text, $indent) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2253 2650
2254 #TODO: intelligently "reformat" paragraph 2651 my ($text, @w) = ref $para ? @$para : $para;
2255 2652
2256 for my $line (split /\n/, $text) { 2653 $para = {
2257 my $height = $self->text_height ($line); 2654 w => 1e10,
2258 $self->{height} += $height; 2655 wrapped => 1,
2259 push @{$self->{par}}, [$height, $color, $indent, $line]; 2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2260 } 2660 };
2261 2661
2262 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2662 $self->add (@w) if @w;
2263 $self->{children}[1]->update; 2663 push @{$self->{par}}, $para;
2664
2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2668
2669sub scroll_to_bottom {
2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2264} 2674}
2265 2675
2266sub update { 2676sub update {
2267 my ($self) = @_; 2677 my ($self) = @_;
2268 2678
… …
2270 2680
2271 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2272 2682
2273 delete $self->{texture}; 2683 delete $self->{texture};
2274 2684
2275 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687
2276 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2277 my $height = 0; 2689 my $height = 0;
2278 2690
2279 $height += $_->[0] = $self->text_height ($_->[3], $_->[2])
2280 for @{$self->{par}}; 2691 for my $para (@{$self->{par}}) {
2692 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2693 my $layout = $self->get_layout ($para);
2694 my ($w, $h) = $layout->size;
2695
2696 $para->{w} = $w + $para->{indent};
2697 $para->{h} = $h;
2698 $para->{wrapped} = $layout->has_wrapped;
2699 }
2700
2701 $height += $para->{h};
2702 }
2281 2703
2282 $self->{height} = $height; 2704 $self->{height} = $height;
2283 2705
2284 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}]; 2706 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2285 $self->{children}[1]->update; 2707
2286
2287 delete $self->{texture}; 2708 delete $self->{texture};
2288 } 2709 }
2289 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2290 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub { 2715 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
2291 glClearColor 0.5, 0.5, 0.5, 0; 2716 glClearColor 0, 0, 0, 0;
2292 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2293 2718
2294 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2295 2720
2296 my $y0 = $top; 2721 my $y0 = $top;
2297 my $y1 = $top + $self->{h}; 2722 my $y1 = $top + $H;
2298 2723
2299 my $y = 0; 2724 my $y = 0;
2300 2725
2301 my $layout = $self->{layout};
2302
2303 $layout->set_font ($self->{font}) if $self->{font};
2304
2305 glEnable GL_BLEND; 2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2306 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; 2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2307 2729
2308 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2309 my $h = $par->[0]; 2731 my $h = $para->{h};
2310 2732
2311 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2312 $layout->set_foreground (@{ $par->[1] }); 2734
2313 $layout->set_width ($self->{w} - $par->[2]); 2735 my $layout = $self->get_layout ($para);
2314 $layout->set_markup ($par->[3]);
2315 2736
2316 my ($w, $h, $data, $format, $internalformat) = $layout->render; 2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2317 2738
2318 glRasterPos $par->[2], $y - $y0; 2739 glRasterPos $para->{indent}, $y - $y0;
2319 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 2740 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data;
2741
2742 if (my @w = @{ $para->{widget} }) {
2743 my @s = $layout->get_shapes;
2744
2745 for (@w) {
2746 my ($dx, $dy) = splice @s, 0, 2, ();
2747
2748 $_->{x} = $dx + $para->{indent};
2749 $_->{y} = $dy + $y - $y0;
2750
2751 $_->draw;
2752 }
2753 }
2320 } 2754 }
2321 2755
2322 $y += $h; 2756 $y += $h;
2323 } 2757 }
2324 2758
2325 glDisable GL_BLEND; 2759 glDisable GL_BLEND;
2326 }; 2760 };
2327 }); 2761 });
2328} 2762}
2329 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2330sub _draw { 2773sub _draw {
2331 my ($self) = @_; 2774 my ($self) = @_;
2332 2775
2333 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2334 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2335 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2336 $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2779 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2337 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2338 2781
2339 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2340
2341} 2783}
2342 2784
2343############################################################################# 2785#############################################################################
2344 2786
2345package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2390 2832
2391sub new { 2833sub new {
2392 my $class = shift; 2834 my $class = shift;
2393 2835
2394 my $self = $class->SUPER::new ( 2836 my $self = $class->SUPER::new (
2395 state => 0, 2837 state => 0,
2396 connect_activate => \&toggle_flopper, 2838 on_activate => \&toggle_flopper,
2397 @_ 2839 @_
2398 ); 2840 );
2399 2841
2400 if ($self->{state}) {
2401 $self->{state} = 0;
2402 $self->toggle_flopper;
2403 }
2404
2405 $self 2842 $self
2406} 2843}
2407 2844
2408sub toggle_flopper { 2845sub toggle_flopper {
2409 my ($self) = @_; 2846 my ($self) = @_;
2410 2847
2411 # TODO: use animation 2848 $self->{other}->toggle_visibility;
2412 if ($self->{state} = !$self->{state}) {
2413 $CFClient::UI::ROOT->add ($self->{other});
2414 $self->{other}->move ($self->coord2global (0, $self->{h}));
2415 $self->emit ("open");
2416 } else {
2417 $CFClient::UI::ROOT->remove ($self->{other});
2418 $self->emit ("close");
2419 }
2420
2421 $self->emit (changed => $self->{state});
2422} 2849}
2423 2850
2424############################################################################# 2851#############################################################################
2425 2852
2426package CFClient::UI::Tooltip; 2853package CFClient::UI::Tooltip;
… …
2439} 2866}
2440 2867
2441sub set_tooltip_from { 2868sub set_tooltip_from {
2442 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2443 2870
2871 my $tooltip = $widget->{tooltip};
2872
2873 if ($ENV{CFPLUS_DEBUG} & 2) {
2874 $tooltip .= "\n\n" . (ref $widget) . "\n"
2875 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2876 . "req $widget->{req_w} $widget->{req_h}\n"
2877 . "visible $widget->{visible}";
2878 }
2879
2880 $tooltip =~ s/^\n+//;
2881 $tooltip =~ s/\n+$//;
2882
2444 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2445 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2446 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2447 fontsize => 0.8, 2886 fontsize => 0.8,
2448 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2449 ellipsise => 0, 2888 ellipsise => 0,
2450 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
… …
2457 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2458 2897
2459 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2460} 2899}
2461 2900
2462sub size_allocate { 2901sub invoke_size_allocate {
2463 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2464 2903
2465 $self->SUPER::size_allocate ($w - 4, $h - 4); 2904 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
2905}
2906
2907sub invoke_visibility_change {
2908 my ($self, $visible) = @_;
2909
2910 return unless $visible;
2911
2912 $self->{root}->on_post_alloc ("move_$self" => sub {
2913 my $widget = $self->{owner}
2914 or return;
2915
2916 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2917
2918 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2919 if $x + $self->{w} > $self->{root}{w};
2920
2921 $self->move_abs ($x, $y);
2922 });
2466} 2923}
2467 2924
2468sub _draw { 2925sub _draw {
2469 my ($self) = @_; 2926 my ($self) = @_;
2470 2927
… …
2487 glVertex $w, $h; 2944 glVertex $w, $h;
2488 glVertex $w, 0; 2945 glVertex $w, 0;
2489 glEnd; 2946 glEnd;
2490 2947
2491 glTranslate 2 - 0.375, 2 - 0.375; 2948 glTranslate 2 - 0.375, 2 - 0.375;
2949
2492 $self->SUPER::_draw; 2950 $self->SUPER::_draw;
2493} 2951}
2494 2952
2495############################################################################# 2953#############################################################################
2496 2954
… …
2502 2960
2503sub new { 2961sub new {
2504 my $class = shift; 2962 my $class = shift;
2505 2963
2506 my $self = $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2507 aspect => 1, 2965 aspect => 1,
2966 can_events => 0,
2508 @_, 2967 @_,
2509 ); 2968 );
2510 2969
2511 if ($self->{anim} && $self->{animspeed}) { 2970 if ($self->{anim} && $self->{animspeed}) {
2512 Scalar::Util::weaken (my $widget = $self); 2971 Scalar::Util::weaken (my $widget = $self);
… …
2527 2986
2528sub size_request { 2987sub size_request {
2529 (32, 8) 2988 (32, 8)
2530} 2989}
2531 2990
2991sub update {
2992 my ($self) = @_;
2993
2994 return unless $self->{visible};
2995
2996 $self->SUPER::update;
2997}
2998
2532sub _draw { 2999sub _draw {
2533 my ($self) = @_; 3000 my ($self) = @_;
2534 3001
2535 return unless $::CONN;#d# manage and cache textures differently 3002 return unless $::CONN;
2536 3003
2537 my $face; 3004 my $face;
2538 3005
2539 if ($self->{frame}) { 3006 if ($self->{frame}) {
2540 my $anim = $::CONN->{anim}[$self->{anim}]; 3007 my $anim = $::CONN->{anim}[$self->{anim}];
… …
2546 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2547 3014
2548 if ($tex) { 3015 if ($tex) {
2549 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2550 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2551 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2552 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2553 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2554 } 3021 }
2555} 3022}
2556 3023
2557sub DESTROY { 3024sub destroy {
2558 my ($self) = @_; 3025 my ($self) = @_;
2559 3026
2560 $self->{timer}->cancel 3027 $self->{timer}->cancel
2561 if $self->{timer}; 3028 if $self->{timer};
2562 3029
2563 $self->SUPER::DESTROY; 3030 $self->SUPER::destroy;
2564} 3031}
2565 3032
2566############################################################################# 3033#############################################################################
2567 3034
2568package CFClient::UI::InventoryItem; 3035package CFClient::UI::Buttonbar;
2569 3036
2570our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFClient::UI::HBox::;
2571 3038
2572sub _item_to_desc { 3039# TODO: should actualyl wrap buttons and other goodies.
2573 my ($item) = @_;
2574
2575 my $desc =
2576 $item->{nrof} < 2
2577 ? $item->{name}
2578 : "$item->{nrof} × $item->{name_pl}";
2579
2580 $item->{flags} & Crossfire::Protocol::F_OPEN
2581 and $desc .= " (open)";
2582 $item->{flags} & Crossfire::Protocol::F_APPLIED
2583 and $desc .= " (applied)";
2584 $item->{flags} & Crossfire::Protocol::F_UNPAID
2585 and $desc .= " (unpaid)";
2586 $item->{flags} & Crossfire::Protocol::F_MAGIC
2587 and $desc .= " (magic)";
2588 $item->{flags} & Crossfire::Protocol::F_CURSED
2589 and $desc .= " (cursed)";
2590 $item->{flags} & Crossfire::Protocol::F_DAMNED
2591 and $desc .= " (damned)";
2592 $item->{flags} & Crossfire::Protocol::F_LOCKED
2593 and $desc .= " *";
2594
2595 $desc
2596}
2597
2598sub new {
2599 my $class = shift;
2600
2601 my %args = @_;
2602
2603 my $item = delete $args{item};
2604
2605 my $desc = _item_to_desc ($item);
2606
2607 my $self = $class->SUPER::new (
2608 can_hover => 1,
2609 can_events => 1,
2610 tooltip => ((CFClient::UI::Label::escape $desc)
2611 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2612 connect_button_down => sub {
2613 my ($self, $ev, $x, $y) = @_;
2614
2615 # todo: maybe put examine on 1? but should just be a tooltip :(
2616 if ($ev->{button} == 1) {
2617 my $targ = $::CONN->{player}{tag};
2618
2619 if ($item->{container} == $::CONN->{player}{tag}) {
2620 $targ = $main::OPENCONT;
2621 }
2622
2623 $::CONN->send ("move $targ $item->{tag} 0");
2624 } elsif ($ev->{button} == 2) {
2625 $::CONN->send ("apply $item->{tag}");
2626 } elsif ($ev->{button} == 3) {
2627 my @menu_items = (
2628 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2629 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2630 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2631 (
2632 $item->{flags} & Crossfire::Protocol::F_LOCKED
2633 ? (
2634 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2635 )
2636 : (
2637 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2638 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2639 )
2640 ),
2641 );
2642
2643 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2644 }
2645
2646 1
2647 },
2648 %args
2649 );
2650
2651
2652 $self->add (new CFClient::UI::Face
2653 can_events => 0,
2654 face => $item->{face},
2655 anim => $item->{anim},
2656 animspeed => $item->{animspeed},
2657 );
2658
2659 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2660
2661 $self->{item} = $item;
2662
2663 $self->update_item;
2664
2665 $self
2666}
2667
2668sub update_item {
2669 my ($self) = @_;
2670
2671 my $desc = _item_to_desc ($self->{item});
2672
2673 $self->{name_lbl}->set_text ($desc);
2674}
2675
2676#############################################################################
2677
2678package CFClient::UI::Inventory;
2679
2680our @ISA = CFClient::UI::ScrolledWindow::;
2681
2682sub new {
2683 my $class = shift;
2684
2685 my $self = $class->SUPER::new (
2686 scrolled => (new CFClient::UI::VBox),
2687 @_,
2688 );
2689
2690 $self
2691}
2692
2693sub set_items {
2694 my ($self, $items) = @_;
2695
2696 $self->{scrolled}->clear;
2697 return unless $items;
2698
2699 my @items = sort {
2700 ($a->{type} <=> $b->{type})
2701 or ($a->{name} cmp $b->{name})
2702 } @$items;
2703
2704 $self->{real_items} = \@items;
2705
2706 for my $item (@items) {
2707 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2708 $item->update_item ();
2709 }
2710
2711 $self->{scrolled}->add (@items);
2712
2713# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2714}
2715
2716sub size_request {
2717 my ($self) = @_;
2718 ($self->{req_w}, $self->{req_h});
2719}
2720 3040
2721############################################################################# 3041#############################################################################
2722 3042
2723package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2724 3044
… …
2736 ); 3056 );
2737 3057
2738 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2739 3059
2740 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2741 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2742 3062
2743 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2744 if (!ref $widget) { 3064 if (!ref $widget) {
2745 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2746 can_hover => 1, 3066 can_hover => 1,
2747 can_events => 1, 3067 can_events => 1,
2748 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2749 } 3070 }
2750 3071
2751 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2752 3073
2753 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2765 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2766 $GRAB = $self; 3087 $GRAB = $self;
2767 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2768 3089
2769 $self->show; 3090 $self->show;
2770 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3091 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2771} 3092}
2772 3093
2773sub mouse_motion { 3094sub invoke_mouse_motion {
2774 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2775 3096
2776 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2777 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2778 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2779}
2780 3100
3101 0
3102}
3103
2781sub button_up { 3104sub invoke_button_up {
2782 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2783 3106
2784 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2785 undef $GRAB; 3108 undef $GRAB;
2786 $self->hide; 3109 $self->hide;
2787 3110
2788 $self->emit ("popdown"); 3111 $self->emit ("popdown");
2789 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2790 } 3117 1
2791} 3118}
2792 3119
2793############################################################################# 3120#############################################################################
2794 3121
2795package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2796 3123
2797our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2798 3125
2799sub new { 3126sub new {
2800 my $class = shift; 3127 my $class = shift;
2801 3128
2802 $class->SUPER::new ( 3129 my $self = $class->SUPER::new (
3130 @_,
3131 );
3132
3133 $self->{current} = $self->{children}[0]
3134 if @{ $self->{children} };
3135
3136 $self
3137}
3138
3139sub add {
3140 my ($self, @widgets) = @_;
3141
3142 $self->SUPER::add (@widgets);
3143
3144 $self->{current} = $self->{children}[0]
3145 if @{ $self->{children} };
3146}
3147
3148sub set_current_page {
3149 my ($self, $page_or_widget) = @_;
3150
3151 my $widget = ref $page_or_widget
3152 ? $page_or_widget
3153 : $self->{children}[$page_or_widget];
3154
3155 $self->{current} = $widget;
3156 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3157
3158 $self->emit (page_changed => $self->{current});
3159
3160 $self->realloc;
3161}
3162
3163sub visible_children {
3164 $_[0]{current}
3165}
3166
3167sub size_request {
3168 my ($self) = @_;
3169
3170 $self->{current}->size_request
3171}
3172
3173sub invoke_size_allocate {
3174 my ($self, $w, $h) = @_;
3175
3176 $self->{current}->configure (0, 0, $w, $h);
3177
3178 1
3179}
3180
3181sub _draw {
3182 my ($self) = @_;
3183
3184 $self->{current}->draw;
3185}
3186
3187#############################################################################
3188
3189package CFClient::UI::Notebook;
3190
3191our @ISA = CFClient::UI::VBox::;
3192
3193sub new {
3194 my $class = shift;
3195
3196 my $self = $class->SUPER::new (
3197 buttonbar => (new CFClient::UI::Buttonbar),
3198 multiplexer => (new CFClient::UI::Multiplexer expand => 1),
3199 # filter => # will be put between multiplexer and $self
3200 @_,
3201 );
3202
3203 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3204 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3205
3206 $self
3207}
3208
3209sub add {
3210 my ($self, $title, $widget, $tooltip) = @_;
3211
3212 Scalar::Util::weaken $self;
3213
3214 $self->{buttonbar}->add (new CFClient::UI::Button
3215 markup => $title,
3216 tooltip => $tooltip,
3217 on_activate => sub { $self->set_current_page ($widget) },
3218 );
3219
3220 $self->{multiplexer}->add ($widget);
3221}
3222
3223sub set_current_page {
3224 my ($self, $page) = @_;
3225
3226 $self->{multiplexer}->set_current_page ($page);
3227 $self->emit (page_changed => $self->{multiplexer}{current});
3228}
3229
3230#############################################################################
3231
3232package CFClient::UI::Combobox;
3233
3234use utf8;
3235
3236our @ISA = CFClient::UI::Button::;
3237
3238sub new {
3239 my $class = shift;
3240
3241 my $self = $class->SUPER::new (
3242 options => [], # [value, title, longdesc], ...
3243 value => undef,
3244 @_,
3245 );
3246
3247 $self->_set_value ($self->{value});
3248
3249 $self
3250}
3251
3252sub invoke_button_down {
3253 my ($self, $ev) = @_;
3254
3255 my @menu_items;
3256
3257 for (@{ $self->{options} }) {
3258 my ($value, $title, $tooltip) = @$_;
3259
3260 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3261 }
3262
3263 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
3264}
3265
3266sub _set_value {
3267 my ($self, $value) = @_;
3268
3269 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3270 or return;
3271
3272 $self->{value} = $item->[0];
3273 $self->set_markup ("$item->[1] ⇓");
3274 $self->set_tooltip ($item->[2]);
3275}
3276
3277sub set_value {
3278 my ($self, $value) = @_;
3279
3280 return unless $self->{value} ne $value;
3281
3282 $self->_set_value ($value);
3283 $self->emit (changed => $value);
3284}
3285
3286#############################################################################
3287
3288package CFClient::UI::Statusbox;
3289
3290our @ISA = CFClient::UI::VBox::;
3291
3292sub new {
3293 my $class = shift;
3294
3295 my $self = $class->SUPER::new (
2803 fontsize => 0.8, 3296 fontsize => 0.8,
2804 @_, 3297 @_,
2805 ) 3298 );
3299
3300 Scalar::Util::weaken (my $this = $self);
3301
3302 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3303
3304 $self
2806} 3305}
2807 3306
2808sub reorder { 3307sub reorder {
2809 my ($self) = @_; 3308 my ($self) = @_;
2810 my $NOW = time; 3309 my $NOW = Time::HiRes::time;
3310
3311 # freeze display when hovering over any label
3312 return if $CFClient::UI::TOOLTIP->{owner}
3313 && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
3314 values %{ $self->{item} };
2811 3315
2812 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2813 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2814 } 3318 }
2815 3319
… …
2818 my @items = sort { 3322 my @items = sort {
2819 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2820 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2821 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2822 3326
3327 $self->{timer}->interval (1);
3328
2823 my $count = 10 + 1; 3329 my $count = 10 + 1;
2824 for my $item (@items) { 3330 for my $item (@items) {
2825 last unless --$count; 3331 last unless --$count;
2826 3332
2827 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2828 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2829 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2830 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2831 : $item->{text}; 3337 : $item->{text};
2832 3338
… …
2840 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2841 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2842 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2843 fontsize => $item->{fontsize} || $self->{fontsize}, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
2844 max_w => $::WIDTH * 0.44, 3350 max_w => $::WIDTH * 0.44,
2845 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2846 can_events => 1, 3352 can_events => 1,
2847 can_hover => 1 3353 can_hover => 1
2848 }; 3354 };
3355
3356 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3357 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3358 $label->update;
3359 $label->set_max_size (undef, $label->{req_h} * $diff)
3360 if $diff < 1;
3361 $self->{timer}->interval (1/30);
3362 } else {
3363 $label->{fg}[3] = $item->{fg}[3] || 1;
3364 }
3365
3366 push @widgets, $label;
2849 } 3367 }
2850 3368
2851 $self->clear; 3369 $self->clear;
2852 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2853} 3371}
… …
2856 my ($self, $text, %arg) = @_; 3374 my ($self, $text, %arg) = @_;
2857 3375
2858 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2859 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2860 3378
3379 return unless $text;
3380
2861 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2862 3382
2863 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2864 3384
2865 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2866 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2867 $item->{count}++; 3387 $item->{count}++;
2868 } else { 3388 } else {
2869 $item->{count} = 1; 3389 $item->{count} = 1;
2870 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2871 } 3391 }
2872 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2873 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2874 delete $item->{label}; 3394 delete $item->{label};
2875 } else { 3395 } else {
2876 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2877 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2896 3416
2897 $self->reorder; 3417 $self->reorder;
2898 $self->SUPER::reconfigure; 3418 $self->SUPER::reconfigure;
2899} 3419}
2900 3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
2901############################################################################# 3429#############################################################################
2902 3430
2903package CFClient::UI::Root; 3431package CFClient::UI::Inventory;
2904 3432
2905our @ISA = CFClient::UI::Container::; 3433our @ISA = CFClient::UI::ScrolledWindow::;
2906
2907use CFClient::OpenGL;
2908 3434
2909sub new { 3435sub new {
2910 my $class = shift; 3436 my $class = shift;
2911 3437
2912 $class->SUPER::new ( 3438 my $self = $class->SUPER::new (
3439 child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
3440 @_,
3441 );
3442
3443 $self
3444}
3445
3446sub set_items {
3447 my ($self, $items) = @_;
3448
3449 $self->{child}->clear;
3450 return unless $items;
3451
3452 my @items = sort {
3453 ($a->{type} <=> $b->{type})
3454 or ($a->{name} cmp $b->{name})
3455 } @$items;
3456
3457 $self->{real_items} = \@items;
3458
3459 my $row = 0;
3460 for my $item (@items) {
3461 CFClient::Item::update_widgets $item;
3462
3463 $self->{child}->add (0, $row, $item->{face_widget});
3464 $self->{child}->add (1, $row, $item->{desc_widget});
3465 $self->{child}->add (2, $row, $item->{weight_widget});
3466
3467 $row++;
3468 }
3469}
3470
3471#############################################################################
3472
3473package CFClient::UI::BindEditor;
3474
3475our @ISA = CFClient::UI::FancyFrame::;
3476
3477sub new {
3478 my $class = shift;
3479
3480 my $self = $class->SUPER::new (binding => [], commands => [], @_);
3481
3482 $self->add (my $vb = new CFClient::UI::VBox);
3483
3484
3485 $vb->add ($self->{rec_btn} = new CFClient::UI::Button
3486 text => "start recording",
3487 tooltip => "Start/Stops recording of actions."
3488 ."All subsequent actions after the recording started will be captured."
3489 ."The actions are displayed after the record was stopped."
3490 ."To bind the action you have to click on the 'Bind' button",
3491 on_activate => sub {
3492 unless ($self->{recording}) {
3493 $self->start;
3494 } else {
3495 $self->stop;
3496 }
3497 });
3498
3499 $vb->add (new CFClient::UI::Label text => "Actions:");
3500 $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
3501
3502 $vb->add (new CFClient::UI::Label text => "Bound to: ");
3503 $vb->add (my $hb = new CFClient::UI::HBox);
3504 $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
3505 $hb->add (new CFClient::UI::Button
3506 text => "bind",
3507 tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
3508 on_activate => sub {
3509 $self->ask_for_bind;
3510 });
3511
3512 $vb->add (my $hb = new CFClient::UI::HBox);
3513 $hb->add (new CFClient::UI::Button
3514 text => "ok",
3515 expand => 1,
3516 tooltip => "This closes the binding editor and saves the binding",
3517 on_activate => sub {
3518 $self->hide;
3519 $self->commit;
3520 });
3521
3522 $hb->add (new CFClient::UI::Button
3523 text => "cancel",
3524 expand => 1,
3525 tooltip => "This closes the binding editor without saving",
3526 on_activate => sub {
3527 $self->hide;
3528 $self->{binding_cancel}->()
3529 if $self->{binding_cancel};
3530 });
3531
3532 $self->update_binding_widgets;
3533
3534 $self
3535}
3536
3537sub cfg_bind {
3538 my ($self, $mod, $sym, $cmds) = @_;
3539 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
3540 ::update_bindings ();
3541}
3542
3543sub cfg_unbind {
3544 my ($self, $mod, $sym, $cmds) = @_;
3545 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym};
3546 ::update_bindings ();
3547}
3548
3549sub commit {
3550 my ($self) = @_;
3551 my ($mod, $sym, $cmds) = $self->get_binding;
3552 if ($sym != 0 && @$cmds > 0) {
3553 $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
3554 ."'. Don't forget 'Save Config'!");
3555 $self->{binding_change}->($mod, $sym, $cmds)
3556 if $self->{binding_change};
3557 } else {
3558 $::STATUSBOX->add ("No action bound, no key or action specified!");
3559 $self->{binding_cancel}->()
3560 if $self->{binding_cancel};
3561 }
3562}
3563
3564sub start {
3565 my ($self) = @_;
3566
3567 $self->{rec_btn}->set_text ("stop recording");
3568 $self->{recording} = 1;
3569 $self->clear_command_list;
3570 $::CONN->start_record if $::CONN;
3571}
3572
3573sub stop {
3574 my ($self) = @_;
3575
3576 $self->{rec_btn}->set_text ("start recording");
3577 $self->{recording} = 0;
3578
3579 my $rec;
3580 $rec = $::CONN->stop_record if $::CONN;
3581 return unless ref $rec eq 'ARRAY';
3582 $self->set_command_list ($rec);
3583}
3584
3585
3586sub ask_for_bind_and_commit {
3587 my ($self) = @_;
3588 $self->ask_for_bind (1);
3589}
3590
3591sub ask_for_bind {
3592 my ($self, $commit, $end_cb) = @_;
3593
3594 CFClient::Binder::open_binding_dialog (sub {
3595 my ($mod, $sym) = @_;
3596 $self->{binding} = [$mod, $sym]; # XXX: how to stop that memleak?
3597 $self->update_binding_widgets;
3598 $self->commit if $commit;
3599 $end_cb->() if $end_cb;
3600 });
3601}
3602
3603# $mod and $sym are the modifiers and key symbol
3604# $cmds is a array ref of strings (the commands)
3605# $cb is the callback that is executed on OK
3606# $ccb is the callback that is executed on CANCEL and
3607# when the binding was unsuccessful on OK
3608sub set_binding {
3609 my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
3610
3611 $self->clear_command_list;
3612 $self->{recording} = 0;
3613 $self->{rec_btn}->set_text ("start recording");
3614
3615 $self->{binding} = [$mod, $sym];
3616 $self->{commands} = $cmds;
3617
3618 $self->{binding_change} = $cb;
3619 $self->{binding_cancel} = $ccb;
3620
3621 $self->update_binding_widgets;
3622}
3623
3624# this is a shortcut method that asks for a binding
3625# and then just binds it.
3626sub do_quick_binding {
3627 my ($self, $cmds, $end_cb) = @_;
3628 $self->set_binding (undef, undef, $cmds, sub { $self->cfg_bind (@_) });
3629 $self->ask_for_bind (1, $end_cb);
3630}
3631
3632sub update_binding_widgets {
3633 my ($self) = @_;
3634 my ($mod, $sym, $cmds) = $self->get_binding;
3635 $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
3636 $self->set_command_list ($cmds);
3637}
3638
3639sub get_binding {
3640 my ($self) = @_;
3641 return (
3642 $self->{binding}->[0],
3643 $self->{binding}->[1],
3644 [ grep { defined $_ } @{$self->{commands}} ]
3645 );
3646}
3647
3648sub clear_command_list {
3649 my ($self) = @_;
3650 $self->{cmdbox}->clear ();
3651}
3652
3653sub set_command_list {
3654 my ($self, $cmds) = @_;
3655
3656 $self->{cmdbox}->clear ();
3657 $self->{commands} = $cmds;
3658
3659 my $idx = 0;
3660
3661 for (@$cmds) {
3662 $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
3663
3664 my $i = $idx;
3665 $hb->add (new CFClient::UI::Label text => $_);
3666 $hb->add (new CFClient::UI::Button
3667 text => "delete",
3668 tooltip => "Deletes the action from the record",
3669 on_activate => sub {
3670 $self->{cmdbox}->remove ($hb);
3671 $cmds->[$i] = undef;
3672 });
3673
3674
3675 $idx++
3676 }
3677}
3678
3679#############################################################################
3680
3681package CFClient::UI::SpellList;
3682
3683our @ISA = CFClient::UI::Table::;
3684
3685sub new {
3686 my $class = shift;
3687
3688 my $self = $class->SUPER::new (
3689 binding => [],
3690 commands => [],
2913 @_, 3691 @_,
2914 ) 3692 )
2915} 3693}
2916 3694
2917sub configure { 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2918 my ($self, $x, $y, $w, $h) = @_;
2919 3696
2920 $self->{w} = $w; 3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2921 $self->{h} = $h; 3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2922} 3699my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3700 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3701my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3702 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3703my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3704 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3705my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3706 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
2923 3707
2924sub check_size { 3708sub rebuild_spell_list {
3709 my ($self) = @_;
3710
3711 $CFClient::UI::ROOT->on_refresh ($self => sub {
3712 $self->clear;
3713
3714 return unless $::CONN;
3715
3716 $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3717 $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3718 $self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3719 $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3720 $self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3721
3722 my $row = 0;
3723
3724 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3725 my $spell = $self->{spell}{$_};
3726
3727 $row++;
3728
3729 my $spell_cb = sub {
3730 my ($widget, $ev) = @_;
3731
3732 if ($ev->{button} == 1) {
3733 $::CONN->user_send ("cast $spell->{name}");
3734 } elsif ($ev->{button} == 2) {
3735 $::CONN->user_send ("invoke $spell->{name}");
3736 } elsif ($ev->{button} == 3) {
3737 (new CFClient::UI::Menu
3738 items => [
3739 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3740 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3741 ],
3742 )->popup ($ev);
3743 } else {
3744 return 0;
3745 }
3746
3747 1
3748 };
3749
3750 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3751
3752 #TODO: add path info to tooltip
3753 #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3754
3755 $self->add (0, $row, new CFClient::UI::Face
3756 face => $spell->{face},
3757 can_hover => 1,
3758 can_events => 1,
3759 tooltip => $tooltip,
3760 on_button_down => $spell_cb,
3761 );
3762
3763 $self->add (1, $row, new CFClient::UI::Label
3764 expand => 1,
3765 text => $spell->{name},
3766 can_hover => 1,
3767 can_events => 1,
3768 tooltip => $tooltip,
3769 on_button_down => $spell_cb,
3770 );
3771
3772 $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3773 $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3774 $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3775 $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3776 }
3777 });
3778}
3779
3780sub add_spell {
2925 my ($self) = @_; 3781 my ($self, $spell) = @_;
2926 3782
2927 $self->size_allocate ($self->{w}, $self->{h}) 3783 $self->{spell}->{$spell->{name}} = $spell;
2928 if $self->{w}; 3784 $self->rebuild_spell_list;
3785}
3786
3787sub remove_spell {
3788 my ($self, $spell) = @_;
3789
3790 delete $self->{spell}->{$spell->{name}};
3791 $self->rebuild_spell_list;
3792}
3793
3794sub clear_spells {
3795 my ($self) = @_;
3796
3797 $self->{spell} = {};
3798 $self->rebuild_spell_list;
3799}
3800
3801#############################################################################
3802
3803package CFClient::UI::Root;
3804
3805our @ISA = CFClient::UI::Container::;
3806
3807use List::Util qw(min max);
3808
3809use CFClient::OpenGL;
3810
3811sub new {
3812 my $class = shift;
3813
3814 my $self = $class->SUPER::new (
3815 visible => 1,
3816 @_,
3817 );
3818
3819 Scalar::Util::weaken ($self->{root} = $self);
3820
3821 $self
2929} 3822}
2930 3823
2931sub size_request { 3824sub size_request {
2932 my ($self) = @_; 3825 my ($self) = @_;
2933 3826
2934 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
2935} 3828}
2936 3829
3830sub _to_pixel {
3831 my ($coord, $size, $max) = @_;
3832
3833 $coord =
3834 $coord eq "center" ? ($max - $size) * 0.5
3835 : $coord eq "max" ? $max
3836 : $coord;
3837
3838 $coord = 0 if $coord < 0;
3839 $coord = $max - $size if $coord > $max - $size;
3840
3841 int $coord + 0.5
3842}
3843
2937sub size_allocate { 3844sub invoke_size_allocate {
2938 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
2939
2940 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2941 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2942
2943 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2944 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2945 3846
2946 for my $child ($self->children) { 3847 for my $child ($self->children) {
2947 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3848 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2948 3849
2949 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3850 $X = $child->{force_x} if exists $child->{force_x};
2950 if exists $child->{req_x}; 3851 $Y = $child->{force_y} if exists $child->{force_y};
2951 3852
2952 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3853 $X = _to_pixel $X, $W, $self->{w};
2953 if exists $child->{req_y}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
2954
2955 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2956 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2957 3855
2958 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
2959 } 3857 }
3858
3859 1
2960} 3860}
2961 3861
2962sub coord2local { 3862sub coord2local {
2963 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
2964 3864
… …
2972} 3872}
2973 3873
2974sub update { 3874sub update {
2975 my ($self) = @_; 3875 my ($self) = @_;
2976 3876
2977 $self->check_size;
2978 $::WANT_REFRESH++; 3877 $::WANT_REFRESH++;
2979} 3878}
2980 3879
2981sub add { 3880sub add {
2982 my ($self, @children) = @_; 3881 my ($self, @children) = @_;
2983 3882
2984 for my $child (@children) {
2985 $child->{toplevel} = 1; 3883 $_->{is_toplevel} = 1
2986 3884 for @children;
2987 # integerise window positions
2988 $child->{x} = int $child->{x};
2989 $child->{y} = int $child->{y};
2990 }
2991 3885
2992 $self->SUPER::add (@children); 3886 $self->SUPER::add (@children);
3887}
3888
3889sub remove {
3890 my ($self, @children) = @_;
3891
3892 $self->SUPER::remove (@children);
3893
3894 delete $self->{is_toplevel}
3895 for @children;
3896
3897 while (@children) {
3898 my $w = pop @children;
3899 push @children, $w->children;
3900 $w->set_invisible;
3901 }
2993} 3902}
2994 3903
2995sub on_refresh { 3904sub on_refresh {
2996 my ($self, $id, $cb) = @_; 3905 my ($self, $id, $cb) = @_;
2997 3906
… …
3010 while ($self->{refresh_hook}) { 3919 while ($self->{refresh_hook}) {
3011 $_->() 3920 $_->()
3012 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
3013 } 3922 }
3014 3923
3015 if ($self->{check_size}) { 3924 if ($self->{realloc}) {
3016 my @queue = ([], []); 3925 my %queue;
3926 my @queue;
3927 my $widget;
3017 3928
3018 for (;;) { 3929 outer:
3019 if ($self->{check_size}) { 3930 while () {
3020 # heuristic: check containers last 3931 if (my $realloc = delete $self->{realloc}) {
3021 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3932 for $widget (values %$realloc) {
3022 for values %{delete $self->{check_size}} 3933 $widget->{visible} or next; # do not resize invisible widgets
3934
3935 $queue{$widget+0}++ and next; # duplicates are common
3936
3937 push @{ $queue[$widget->{visible}] }, $widget;
3938 }
3023 } 3939 }
3024 3940
3025 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3941 while () {
3942 @queue or last outer;
3026 3943
3027 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3944 $widget = pop @{ $queue[-1] || [] }
3028 ? @$widget{qw(user_w user_h)} 3945 and last;
3029 : $widget->size_request;
3030
3031 if (delete $widget->{force_alloc}
3032 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3033 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3034 3946
3947 pop @queue;
3948 }
3949
3950 delete $queue{$widget+0};
3951
3952 my ($w, $h) = $widget->size_request;
3953
3954 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3955 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3956
3957 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3958 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3959
3960 $w = $widget->{force_w} if exists $widget->{force_w};
3961 $h = $widget->{force_h} if exists $widget->{force_h};
3962
3963 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3964 || delete $widget->{force_realloc}) {
3035 $widget->{req_w} = $w; 3965 $widget->{req_w} = $w;
3036 $widget->{req_h} = $h; 3966 $widget->{req_h} = $h;
3037 3967
3038 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3968 $self->{size_alloc}{$widget+0} = $widget;
3039 3969
3040 $widget->{parent}->check_size
3041 if $widget->{parent}; 3970 if (my $parent = $widget->{parent}) {
3971 $self->{realloc}{$parent+0} = $parent
3972 unless $queue{$parent+0};
3973
3974 $parent->{force_size_alloc} = 1;
3975 $self->{size_alloc}{$parent+0} = $parent;
3976 }
3042 } 3977 }
3978
3979 delete $self->{realloc}{$widget+0};
3043 } 3980 }
3044 } 3981 }
3045 3982
3046 while ($self->{size_alloc}) { 3983 while (my $size_alloc = delete $self->{size_alloc}) {
3047 for (values %{delete $self->{size_alloc}}) { 3984 my @queue = sort { $b->{visible} <=> $a->{visible} }
3048 my ($widget, $w, $h) = @$_; 3985 values %$size_alloc;
3986
3987 while () {
3988 my $widget = pop @queue || last;
3989
3990 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3049 3991
3050 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
3051 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
3052 3994
3995 $w = int $w + 0.5;
3996 $h = int $h + 0.5;
3997
3998 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3999 $widget->{old_w} = $widget->{w};
4000 $widget->{old_h} = $widget->{h};
4001
3053 $widget->{w} = $w; 4002 $widget->{w} = $w;
3054 $widget->{h} = $h; 4003 $widget->{h} = $h;
3055 $widget->size_allocate ($w, $h); 4004
3056 $widget->emit (size_allocate => $w, $h); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
3057 } 4007 }
3058 } 4008 }
3059 4009
3060 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3061 $_->() 4011 $_->()
3062 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3063 } 4013 }
4014
3064 4015
3065 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3066 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3067 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3068 4019
… …
3070 glLoadIdentity; 4021 glLoadIdentity;
3071 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3072 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3073 glLoadIdentity; 4024 glLoadIdentity;
3074 4025
4026 {
4027 package CFClient::UI::Base;
4028
4029 ($draw_x, $draw_y, $draw_w, $draw_h) =
4030 (0, 0, $self->{w}, $self->{h});
4031 }
4032
3075 $self->_draw; 4033 $self->_draw;
3076} 4034}
3077 4035
3078############################################################################# 4036#############################################################################
3079 4037

Diff Legend

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