ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.212 by elmex, Wed May 17 14:55:14 2006 UTC vs.
Revision 1.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) = @_;
… …
136 $rem += $_ - $i; 150 $rem += $_ - $i;
137 $_ = $i; 151 $_ = $i;
138 } 152 }
139} 153}
140 154
155sub full_refresh {
156 # make a copy, otherwise for complains about freed values.
157 my @widgets = values %WIDGET;
158
159 $_->update
160 for @widgets;
161}
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
141# call when resolution changes etc. 171# call when resolution changes etc.
142sub rescale_widgets { 172sub rescale_widgets {
143 my ($sx, $sy) = @_; 173 my ($sx, $sy) = @_;
144 174
145 for my $widget (values %WIDGET) { 175 for my $widget (values %WIDGET) {
146 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
147 $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.]+$/;
148 $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};
149 $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};
150 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
151 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 183 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
152 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 184 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
153 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 185 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
154 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h}; 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
155 } 190 }
156
157 $widget->reconfigure;
158 } 191 }
192
193 reconfigure_widgets;
159} 194}
160 195
161############################################################################# 196#############################################################################
162 197
163package CFClient::UI::Base; 198package CFClient::UI::Base;
… …
168 203
169sub new { 204sub new {
170 my $class = shift; 205 my $class = shift;
171 206
172 my $self = bless { 207 my $self = bless {
173 x => 0, 208 x => "center",
174 y => 0, 209 y => "center",
175 z => 0, 210 z => 0,
211 w => undef,
212 h => undef,
176 can_events => 1, 213 can_events => 1,
177 @_ 214 @_
178 }, $class; 215 }, $class;
179 216
217 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
218
180 for (keys %$self) { 219 for (keys %$self) {
181 if (/^connect_(.*)$/) { 220 if (/^on_(.*)$/) {
182 $self->connect ($1 => delete $self->{$_}); 221 $self->connect ($1 => delete $self->{$_});
183 } 222 }
184 } 223 }
185 224
186 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 }
187 236
188 $self 237 $self
189} 238}
190 239
191sub destroy { 240sub destroy {
… …
201 return if $self->{parent}; 250 return if $self->{parent};
202 251
203 $CFClient::UI::ROOT->add ($self); 252 $CFClient::UI::ROOT->add ($self);
204} 253}
205 254
206sub hide { 255sub set_visible {
207 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};
208 279
209 undef $GRAB if $GRAB == $self; 280 undef $GRAB if $GRAB == $self;
210 undef $HOVER if $HOVER == $self; 281 undef $HOVER if $HOVER == $self;
211 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
212 $self->{parent}->remove ($self) 312 $self->{parent}->remove ($self)
213 if $self->{parent}; 313 if $self->{parent};
214} 314}
215 315
216sub move { 316sub move_abs {
217 my ($self, $x, $y, $z) = @_; 317 my ($self, $x, $y, $z) = @_;
218 318
219 $self->{x} = int $x; 319 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
220 $self->{y} = int $y; 320 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
221 $self->{z} = $z if defined $z; 321 $self->{z} = $z if defined $z;
222 322
223 $self->update; 323 $self->update;
224} 324}
225 325
226sub set_size { 326sub set_size {
227 my ($self, $w, $h) = @_; 327 my ($self, $w, $h) = @_;
228 328
229 $self->{user_w} = $w; 329 $self->{force_w} = $w;
230 $self->{user_h} = $h; 330 $self->{force_h} = $h;
231 331
232 $self->check_size; 332 $self->realloc;
233} 333}
234 334
235sub size_request { 335sub size_request {
236 require Carp; 336 require Carp;
237 Carp::confess "size_request is abstract"; 337 Carp::confess "size_request is abstract";
238} 338}
239 339
340sub baseline_shift {
341 0
342}
343
240sub configure { 344sub configure {
241 my ($self, $x, $y, $w, $h) = @_; 345 my ($self, $x, $y, $w, $h) = @_;
242 346
243 if ($self->{aspect}) { 347 if ($self->{aspect}) {
348 my ($ow, $oh) = ($w, $h);
349
244 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 350 $w = List::Util::min $w, int $h * $self->{aspect};
245 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 351 $h = List::Util::min $h, int $w / $self->{aspect};
246 352
247 # use alignment to adjust x, y 353 # use alignment to adjust x, y
248 354
249 $x += int +($w - $w2) * 0.5; 355 $x += int 0.5 * ($ow - $w);
250 $y += int +($h - $h2) * 0.5; 356 $y += int 0.5 * ($oh - $h);
251
252 ($w, $h) = ($w2, $h2);
253 } 357 }
254 358
255 if ($self->{x} != $x || $self->{y} != $y) { 359 if ($self->{x} ne $x || $self->{y} ne $y) {
256 $self->{x} = $x; 360 $self->{x} = $x;
257 $self->{y} = $y; 361 $self->{y} = $y;
258 $self->update; 362 $self->update;
259 } 363 }
260 364
261 if ($self->{w} != $w || $self->{h} != $h) { 365 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
262 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 366 return unless $self->{visible};
263 }
264}
265 367
266sub size_allocate { 368 $self->{alloc_w} = $w;
267 # nothing to be done 369 $self->{alloc_h} = $h;
268}
269 370
270sub reconfigure { 371 $self->{root}{size_alloc}{$self+0} = $self;
271 my ($self) = @_; 372 }
272
273 $self->check_size (1);
274 $self->update;
275} 373}
276 374
277sub children { 375sub children {
376 # nop
377}
378
379sub visible_children {
380 $_[0]->children
278} 381}
279 382
280sub set_max_size { 383sub set_max_size {
281 my ($self, $w, $h) = @_; 384 my ($self, $w, $h) = @_;
282 385
283 delete $self->{max_w}; $self->{max_w} = $w if $w; 386 $self->{max_w} = int $w if defined $w;
284 delete $self->{max_h}; $self->{max_h} = $h if $h; 387 $self->{max_h} = int $h if defined $h;
388
389 $self->realloc;
285} 390}
286 391
287sub set_tooltip { 392sub set_tooltip {
288 my ($self, $tooltip) = @_; 393 my ($self, $tooltip) = @_;
289 394
395 $tooltip =~ s/^\s+//;
396 $tooltip =~ s/\s+$//;
397
398 return if $self->{tooltip} eq $tooltip;
399
290 $self->{tooltip} = $tooltip; 400 $self->{tooltip} = $tooltip;
291 401
292 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 402 if ($CFClient::UI::TOOLTIP->{owner} == $self) {
293 delete $CFClient::UI::TOOLTIP->{owner}; 403 delete $CFClient::UI::TOOLTIP->{owner};
294 CFClient::UI::check_tooltip; 404 $CFClient::UI::TOOLTIP_WATCHER->cb->();
295 } 405 }
296} 406}
297 407
298# translate global coordinates to local coordinate system 408# translate global coordinates to local coordinate system
299sub coord2local { 409sub coord2local {
… …
307 my ($self, $x, $y) = @_; 417 my ($self, $x, $y) = @_;
308 418
309 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 419 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
310} 420}
311 421
312sub focus_in { 422sub invoke_focus_in {
313 my ($self) = @_; 423 my ($self) = @_;
314 424
315 return if $FOCUS == $self; 425 return if $FOCUS == $self;
316 return unless $self->{can_focus}; 426 return unless $self->{can_focus};
317 427
318 my $focus = $FOCUS; $FOCUS = $self; 428 my $focus = $FOCUS; $FOCUS = $self;
319 429
320 $self->emit (focus_in => $focus);
321
322 $focus->update if $focus; 430 $focus->update if $focus;
323 $FOCUS->update; 431 $FOCUS->update;
324}
325 432
433 0
434}
435
326sub focus_out { 436sub invoke_focus_out {
327 my ($self) = @_; 437 my ($self) = @_;
328 438
329 return unless $FOCUS == $self; 439 return unless $FOCUS == $self;
330 440
331 my $focus = $FOCUS; undef $FOCUS; 441 my $focus = $FOCUS; undef $FOCUS;
332 442
333 $self->emit (focus_out => $focus);
334
335 $focus->update if $focus; #? 443 $focus->update if $focus; #?
336}
337 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
338sub mouse_motion { } 457sub invoke_mouse_motion { 1 }
339sub button_up { } 458sub invoke_button_up { 1 }
340sub key_down { } 459sub invoke_key_down { 1 }
341sub key_up { } 460sub invoke_key_up { 1 }
342 461
343sub button_down { 462sub invoke_button_down {
344 my ($self, $ev, $x, $y) = @_; 463 my ($self, $ev, $x, $y) = @_;
345 464
346 $self->focus_in; 465 $self->grab_focus;
347}
348 466
349sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 467 1
350sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 468}
351sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 469
352sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 470sub connect {
353sub 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
354 535
355sub draw { 536sub draw {
356 my ($self) = @_; 537 my ($self) = @_;
357 538
358 return unless $self->{h} && $self->{w}; 539 return unless $self->{h} && $self->{w};
540
541 # update screen rectangle
542 local $draw_x = $draw_x + $self->{x};
543 local $draw_y = $draw_y + $self->{y};
544 local $draw_w = $draw_x + $self->{w};
545 local $draw_h = $draw_y + $self->{h};
546
547 # skip widgets that are entirely outside the drawing area
548 return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
549 || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
359 550
360 glPushMatrix; 551 glPushMatrix;
361 glTranslate $self->{x}, $self->{y}, 0; 552 glTranslate $self->{x}, $self->{y}, 0;
362 $self->_draw;
363 glPopMatrix;
364 553
365 if ($self == $HOVER && $self->{can_hover}) { 554 if ($self == $HOVER && $self->{can_hover}) {
366 my ($x, $y) = @$self{qw(x y)};
367
368 glColor 1, 0.8, 0.5, 0.2; 555 glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
369 glEnable GL_BLEND; 556 glEnable GL_BLEND;
370 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 557 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
371 glBegin GL_QUADS; 558 glBegin GL_QUADS;
372 glVertex $x , $y;
373 glVertex $x + $self->{w}, $y;
374 glVertex $x + $self->{w}, $y + $self->{h};
375 glVertex $x , $y + $self->{h};
376 glEnd;
377 glDisable GL_BLEND;
378 }
379
380 if ($ENV{PCLIENT_DEBUG}) {
381 glPushMatrix;
382 glColor 1, 1, 0, 1;
383 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
384 glBegin GL_LINE_LOOP;
385 glVertex 0 , 0; 559 glVertex 0 , 0;
386 glVertex $self->{w}, 0; 560 glVertex $self->{w}, 0;
387 glVertex $self->{w}, $self->{h}; 561 glVertex $self->{w}, $self->{h};
388 glVertex 0 , $self->{h}; 562 glVertex 0 , $self->{h};
389 glEnd; 563 glEnd;
564 glDisable GL_BLEND;
565 }
566
567 if ($ENV{CFPLUS_DEBUG} & 1) {
568 glPushMatrix;
569 glColor 1, 1, 0, 1;
570 glTranslate 0.375, 0.375;
571 glBegin GL_LINE_LOOP;
572 glVertex 0 , 0;
573 glVertex $self->{w} - 1, 0;
574 glVertex $self->{w} - 1, $self->{h} - 1;
575 glVertex 0 , $self->{h} - 1;
576 glEnd;
390 glPopMatrix; 577 glPopMatrix;
391 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw; 578 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
392 } 579 }
580
581 $self->_draw;
582 glPopMatrix;
393} 583}
394 584
395sub _draw { 585sub _draw {
396 my ($self) = @_; 586 my ($self) = @_;
397 587
398 warn "no draw defined for $self\n"; 588 warn "no draw defined for $self\n";
399} 589}
400 590
401sub find_widget {
402 my ($self, $x, $y) = @_;
403
404 return () unless $self->{can_events};
405
406 return $self
407 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
408 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
409
410 ()
411}
412
413sub set_parent {
414 my ($self, $parent) = @_;
415
416 Scalar::Util::weaken ($self->{parent} = $parent);
417
418 # TODO: req_w _does_change after ->reconfigure
419 $self->check_size
420 unless exists $self->{req_w};
421}
422
423sub check_size {
424 my ($self, $forced) = @_;
425
426 $self->{force_alloc} = 1 if $forced;
427 $CFClient::UI::ROOT->{check_size}{$self} = $self;
428}
429
430sub update {
431 my ($self) = @_;
432
433 $self->{parent}->update
434 if $self->{parent};
435}
436
437sub connect {
438 my ($self, $signal, $cb) = @_;
439
440 push @{ $self->{signal_cb}{$signal} }, $cb;
441}
442
443sub emit {
444 my ($self, $signal, @args) = @_;
445
446 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
447}
448
449sub DESTROY { 591sub DESTROY {
450 my ($self) = @_; 592 my ($self) = @_;
451 593
452 delete $WIDGET{$self+0}; 594 delete $WIDGET{$self+0};
453 #$self->deactivate; 595
596 eval { $self->destroy };
597 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
454} 598}
455 599
456############################################################################# 600#############################################################################
457 601
458package CFClient::UI::DrawBG; 602package CFClient::UI::DrawBG;
… …
483 627
484 if ($color && (@$color < 4 || $color->[3])) { 628 if ($color && (@$color < 4 || $color->[3])) {
485 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
486 630
487 glEnable GL_BLEND; 631 glEnable GL_BLEND;
488 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 632 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
489 glColor @$color; 633 glColor_premultiply @$color;
490 634
491 glBegin GL_QUADS; 635 glBegin GL_QUADS;
492 glVertex 0 , 0; 636 glVertex 0 , 0;
493 glVertex 0 , $h; 637 glVertex 0 , $h;
494 glVertex $w, $h; 638 glVertex $w, $h;
… …
509 my ($class, %arg) = @_; 653 my ($class, %arg) = @_;
510 $class->SUPER::new (can_events => 0, %arg); 654 $class->SUPER::new (can_events => 0, %arg);
511} 655}
512 656
513sub size_request { 657sub size_request {
514 (0, 0) 658 my ($self) = @_;
659
660 ($self->{w} + 0, $self->{h} + 0)
515} 661}
516 662
517sub draw { } 663sub draw { }
518 664
519############################################################################# 665#############################################################################
… …
523our @ISA = CFClient::UI::Base::; 669our @ISA = CFClient::UI::Base::;
524 670
525sub new { 671sub new {
526 my ($class, %arg) = @_; 672 my ($class, %arg) = @_;
527 673
528 my $children = delete $arg{children} || []; 674 my $children = delete $arg{children};
529 675
530 my $self = $class->SUPER::new ( 676 my $self = $class->SUPER::new (
531 children => [], 677 children => [],
532 can_events => 0, 678 can_events => 0,
533 %arg, 679 %arg,
534 ); 680 );
681
535 $self->add ($_) for @$children; 682 $self->add (@$children)
683 if $children;
536 684
537 $self 685 $self
538} 686}
539 687
540sub add { 688sub add {
… …
548 $self->{children} = [ 696 $self->{children} = [
549 sort { $a->{z} <=> $b->{z} } 697 sort { $a->{z} <=> $b->{z} }
550 @{$self->{children}}, @widgets 698 @{$self->{children}}, @widgets
551 ]; 699 ];
552 700
553 $self->check_size (1); 701 $self->realloc;
554 $self->update;
555} 702}
556 703
557sub children { 704sub children {
558 @{ $_[0]{children} } 705 @{ $_[0]{children} }
559} 706}
… …
564 delete $child->{parent}; 711 delete $child->{parent};
565 $child->hide; 712 $child->hide;
566 713
567 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 714 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
568 715
569 $self->check_size; 716 $self->realloc;
570 $self->update;
571} 717}
572 718
573sub clear { 719sub clear {
574 my ($self) = @_; 720 my ($self) = @_;
575 721
… …
579 for (@$children) { 725 for (@$children) {
580 delete $_->{parent}; 726 delete $_->{parent};
581 $_->hide; 727 $_->hide;
582 } 728 }
583 729
584 $self->check_size; 730 $self->realloc;
585 $self->update;
586} 731}
587 732
588sub find_widget { 733sub find_widget {
589 my ($self, $x, $y) = @_; 734 my ($self, $x, $y) = @_;
590 735
591 $x -= $self->{x}; 736 $x -= $self->{x};
592 $y -= $self->{y}; 737 $y -= $self->{y};
593 738
594 my $res; 739 my $res;
595 740
596 for (reverse @{ $self->{children} }) { 741 for (reverse $self->visible_children) {
597 $res = $_->find_widget ($x, $y) 742 $res = $_->find_widget ($x, $y)
598 and return $res; 743 and return $res;
599 } 744 }
600 745
601 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 746 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
… …
622} 767}
623 768
624sub add { 769sub add {
625 my ($self, $child) = @_; 770 my ($self, $child) = @_;
626 771
627 $self->{children} = []; 772 $self->SUPER::remove ($_) for @{ $self->{children} };
628
629 $self->SUPER::add ($child); 773 $self->SUPER::add ($child);
630} 774}
631 775
632sub remove { 776sub remove {
633 my ($self, $widget) = @_; 777 my ($self, $widget) = @_;
… …
642 786
643sub size_request { 787sub size_request {
644 $_[0]{children}[0]->size_request 788 $_[0]{children}[0]->size_request
645} 789}
646 790
647sub size_allocate { 791sub invoke_size_allocate {
648 my ($self, $w, $h) = @_; 792 my ($self, $w, $h) = @_;
649 793
650 $self->{children}[0]->configure (0, 0, $w, $h); 794 $self->{children}[0]->configure (0, 0, $w, $h);
795
796 1
651} 797}
652 798
653############################################################################# 799#############################################################################
800
801# back-buffered drawing area
654 802
655package CFClient::UI::Window; 803package CFClient::UI::Window;
656 804
657our @ISA = CFClient::UI::Bin::; 805our @ISA = CFClient::UI::Bin::;
658 806
… …
669 817
670 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 818 $ROOT->on_post_alloc ($self => sub { $self->render_child });
671 $self->SUPER::update; 819 $self->SUPER::update;
672} 820}
673 821
674sub size_allocate { 822sub invoke_size_allocate {
675 my ($self, $w, $h) = @_; 823 my ($self, $w, $h) = @_;
676 824
677 $self->SUPER::size_allocate ($w, $h);
678 $self->update; 825 $self->update;
826
827 $self->SUPER::invoke_size_allocate ($w, $h)
679} 828}
680 829
681sub _render { 830sub _render {
831 my ($self) = @_;
832
682 $_[0]{children}[0]->draw; 833 $self->{children}[0]->draw;
683} 834}
684 835
685sub render_child { 836sub render_child {
686 my ($self) = @_; 837 my ($self) = @_;
687 838
688 $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 {
689 glClearColor 0, 0, 0, 0; 840 glClearColor 0, 0, 0, 0;
690 glClear GL_COLOR_BUFFER_BIT; 841 glClear GL_COLOR_BUFFER_BIT;
691 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
692 $self->_render; 850 $self->_render;
693# glColorMask 1, 1, 1, 0;
694# glEnable GL_BLEND;
695# glBlendFunc GL_SRC_ALPHA, GL_ZERO;
696# glRasterPos 0, 0;
697# glCopyPixels 0, 0, $self->{w}, $self->{h};
698# glDisable GL_BLEND;
699# glColorMask 1, 1, 1, 1;
700 }; 851 };
701} 852}
702 853
703sub _draw { 854sub _draw {
704 my ($self) = @_; 855 my ($self) = @_;
705 856
706 my ($w, $h) = ($self->w, $self->h); 857 my ($w, $h) = @$self{qw(w h)};
707 858
708 my $tex = $self->{texture} 859 my $tex = $self->{texture}
709 or return; 860 or return;
710 861
711 glEnable GL_TEXTURE_2D; 862 glEnable GL_TEXTURE_2D;
… …
721 872
722package CFClient::UI::ViewPort; 873package CFClient::UI::ViewPort;
723 874
724our @ISA = CFClient::UI::Window::; 875our @ISA = CFClient::UI::Window::;
725 876
877sub new {
878 my $class = shift;
879
880 $class->SUPER::new (
881 scroll_x => 0,
882 scroll_y => 1,
883 @_,
884 )
885}
886
726sub size_request { 887sub size_request {
727 my ($self) = @_; 888 my ($self) = @_;
728 889
729 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 890 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
730 $self->child->configure (0, 0, @$self{qw(child_w child_h)});
731 891
732 @$self{qw(child_w child_h)} 892 $w = 10 if $self->{scroll_x};
733} 893 $h = 10 if $self->{scroll_y};
734 894
895 ($w, $h)
896}
897
735sub size_allocate { 898sub invoke_size_allocate {
736 my ($self, $w, $h) = @_; 899 my ($self, $w, $h) = @_;
737 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);
738 $self->update; 907 $self->update;
908
909 1
739} 910}
740 911
741sub set_offset { 912sub set_offset {
742 my ($self, $x, $y) = @_; 913 my ($self, $x, $y) = @_;
743 914
… …
776} 947}
777 948
778sub _render { 949sub _render {
779 my ($self) = @_; 950 my ($self) = @_;
780 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
781 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 955 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
782 956
783 $self->SUPER::_render; 957 $self->SUPER::_render;
784} 958}
785 959
… …
788package CFClient::UI::ScrolledWindow; 962package CFClient::UI::ScrolledWindow;
789 963
790our @ISA = CFClient::UI::HBox::; 964our @ISA = CFClient::UI::HBox::;
791 965
792sub new { 966sub new {
793 my $class = shift; 967 my ($class, %arg) = @_;
968
969 my $child = delete $arg{child};
794 970
795 my $self; 971 my $self;
796 972
797 my $slider = new CFClient::UI::Slider 973 my $slider = new CFClient::UI::Slider
798 vertical => 1, 974 vertical => 1,
799 range => [0, 0, 1, 0.01], # HACK fix 975 range => [0, 0, 1, 0.01], # HACK fix
800 connect_changed => sub { 976 on_changed => sub {
801 $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h})); 977 $self->{vp}->set_offset (0, $_[1]);
802 }, 978 },
803 ; 979 ;
804 980
805 $self = $class->SUPER::new ( 981 $self = $class->SUPER::new (
806 vp => (new CFClient::UI::ViewPort), 982 vp => (new CFClient::UI::ViewPort expand => 1),
807 slider => $slider, 983 slider => $slider,
808 @_, 984 %arg,
809 ); 985 );
810 986
811 $self->{vp}->add ($self->{scrolled});
812 $self->add ($self->{vp});
813 $self->add ($self->{slider}); 987 $self->SUPER::add ($self->{vp}, $self->{slider});
988 $self->add ($child) if $child;
814 989
815 $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)
816} 1016}
817 1017
818#TODO# update range on size_allocate depending on child 1018#TODO# update range on size_allocate depending on child
819# update viewport offset on scroll 1019# update viewport offset on scroll
820 1020
… …
840 1040
841 if ($self->{bg}) { 1041 if ($self->{bg}) {
842 my ($w, $h) = @$self{qw(w h)}; 1042 my ($w, $h) = @$self{qw(w h)};
843 1043
844 glEnable GL_BLEND; 1044 glEnable GL_BLEND;
845 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1045 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
846 glColor @{ $self->{bg} }; 1046 glColor_premultiply @{ $self->{bg} };
847 1047
848 glBegin GL_QUADS; 1048 glBegin GL_QUADS;
849 glVertex 0 , 0; 1049 glVertex 0 , 0;
850 glVertex 0 , $h; 1050 glVertex 0 , $h;
851 glVertex $w, $h; 1051 glVertex $w, $h;
… …
864 1064
865our @ISA = CFClient::UI::Bin::; 1065our @ISA = CFClient::UI::Bin::;
866 1066
867use CFClient::OpenGL; 1067use CFClient::OpenGL;
868 1068
869my @tex = 1069my $bg =
1070 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1071 mipmap => 1, wrap => 1;
1072
1073my @border =
870 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1074 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
871 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1075 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
872 1076
873sub new { 1077sub new {
874 my $class = shift; 1078 my ($class, %arg) = @_;
875
876 # TODO: user_x, user_y, overwrite moveto?
877 1079
878 my $self = $class->SUPER::new ( 1080 my $self = $class->SUPER::new (
879 bg => [1, 1, 1, 1], 1081 bg => [1, 1, 1, 1],
880 border_bg => [1, 1, 1, 1], 1082 border_bg => [1, 1, 1, 1],
881 border => 0.6, 1083 border => 0.6,
882 toplevel => 1,
883 can_events => 1, 1084 can_events => 1,
884 @_ 1085 min_w => 16,
1086 min_h => 16,
1087 %arg,
885 ); 1088 );
886 1089
887 $self->{title} &&= new CFClient::UI::Label 1090 $self->{title_widget} = new CFClient::UI::Label
888 align => 0, 1091 align => 0,
889 valign => 1, 1092 valign => 1,
890 text => $self->{title}, 1093 text => $self->{title},
891 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 }
892 1105
893 $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};
894} 1115}
895 1116
896sub border { 1117sub border {
897 int $_[0]{border} * $::FONTSIZE 1118 int $_[0]{border} * $::FONTSIZE
898} 1119}
899 1120
900sub size_request { 1121sub size_request {
901 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};
902 1129
903 my ($w, $h) = $self->SUPER::size_request; 1130 my ($w, $h) = $self->SUPER::size_request;
904 1131
905 ( 1132 (
906 $w + $self->border * 2, 1133 $w + $self->border * 2,
907 $h + $self->border * 2, 1134 $h + $self->border * 2,
908 ) 1135 )
909} 1136}
910 1137
911sub size_allocate { 1138sub invoke_size_allocate {
912 my ($self, $w, $h) = @_; 1139 my ($self, $w, $h) = @_;
913 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
914 $h -= List::Util::max 0, $self->border * 2; 1149 $h -= List::Util::max 0, $border * 2;
915 $w -= List::Util::max 0, $self->border * 2; 1150 $w -= List::Util::max 0, $border * 2;
916 1151
917 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
918 if $self->{title};
919
920 $self->child->configure ($self->border, $self->border, $w, $h); 1152 $self->child->configure ($border, $border, $w, $h);
921}
922 1153
1154 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1155 if $self->{close_button};
1156
1157 1
1158}
1159
923sub button_down { 1160sub invoke_button_down {
924 my ($self, $ev, $x, $y) = @_; 1161 my ($self, $ev, $x, $y) = @_;
925 1162
926 my ($w, $h) = @$self{qw(w h)}; 1163 my ($w, $h) = @$self{qw(w h)};
927 my $border = $self->border; 1164 my $border = $self->border;
928 1165
… …
941 my ($ev, $x, $y) = @_; 1178 my ($ev, $x, $y) = @_;
942 1179
943 my $dx = $ev->{x} - $ox; 1180 my $dx = $ev->{x} - $ox;
944 my $dy = $ev->{y} - $oy; 1181 my $dy = $ev->{y} - $oy;
945 1182
946 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1183 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
947 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1184 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1185
948 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1186 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
949 $self->check_size; 1187 $self->realloc;
950 }; 1188 };
951 1189
952 } elsif ($lr ^ $td) { 1190 } elsif ($lr ^ $td) {
953 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1191 my ($ox, $oy) = ($ev->{x}, $ev->{y});
954 my ($bx, $by) = ($self->{x}, $self->{y}); 1192 my ($bx, $by) = ($self->{x}, $self->{y});
… …
956 $self->{motion} = sub { 1194 $self->{motion} = sub {
957 my ($ev, $x, $y) = @_; 1195 my ($ev, $x, $y) = @_;
958 1196
959 ($x, $y) = ($ev->{x}, $ev->{y}); 1197 ($x, $y) = ($ev->{x}, $ev->{y});
960 1198
961 $self->move ($bx + $x - $ox, $by + $y - $oy); 1199 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
962 $self->update; 1200 # HACK: the next line is required to enforce placement
1201 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
963 }; 1202 };
1203 } else {
1204 return 0;
1205 }
1206
964 } 1207 1
965} 1208}
966 1209
967sub button_up { 1210sub invoke_button_up {
968 my ($self, $ev, $x, $y) = @_; 1211 my ($self, $ev, $x, $y) = @_;
969 1212
970 delete $self->{motion}; 1213 ! ! delete $self->{motion}
971} 1214}
972 1215
973sub mouse_motion { 1216sub invoke_mouse_motion {
974 my ($self, $ev, $x, $y) = @_; 1217 my ($self, $ev, $x, $y) = @_;
975 1218
976 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1219 $self->{motion}->($ev, $x, $y) if $self->{motion};
1220
1221 ! ! $self->{motion}
977} 1222}
978 1223
979sub _draw { 1224sub _draw {
980 my ($self) = @_; 1225 my ($self) = @_;
981 1226
1227 my $child = $self->{children}[0];
1228
982 my ($w, $h ) = ($self->{w}, $self->{h}); 1229 my ($w, $h ) = ($self->{w}, $self->{h});
983 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1230 my ($cw, $ch) = ($child->{w}, $child->{h});
984 1231
985 glEnable GL_TEXTURE_2D; 1232 glEnable GL_TEXTURE_2D;
986 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1233 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
987 1234
988 my $border = $self->border; 1235 my $border = $self->border;
989 1236
990 glColor @{ $self->{border_bg} }; 1237 glColor @{ $self->{border_bg} };
991 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1238 $border[0]->draw_quad_alpha (0, 0, $w, $border);
992 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1239 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
993 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1240 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
994 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1241 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
995 1242
996 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1243 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
997 my $bg = $tex[0]; 1244 glColor @{ $self->{bg} };
998 1245
999 # TODO: repeat texture not scale 1246 # TODO: repeat texture not scale
1247 # solve this better(?)
1000 my $rep_x = $cw / $bg->{w}; 1248 $bg->{s} = $cw / $bg->{w};
1001 my $rep_y = $ch / $bg->{h}; 1249 $bg->{t} = $ch / $bg->{h};
1002
1003 glColor @{ $self->{bg} };
1004
1005 $bg->{s} = $rep_x;
1006 $bg->{t} = $rep_y;
1007 $bg->{wrap_mode} = 1;
1008 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1250 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1009 } 1251 }
1010 1252
1011 glDisable GL_TEXTURE_2D; 1253 glDisable GL_TEXTURE_2D;
1012 1254
1013 $self->{title}->draw if $self->{title};
1014
1015 $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};
1016} 1266}
1017 1267
1018############################################################################# 1268#############################################################################
1019 1269
1020package CFClient::UI::Table; 1270package CFClient::UI::Table;
… …
1028sub new { 1278sub new {
1029 my $class = shift; 1279 my $class = shift;
1030 1280
1031 $class->SUPER::new ( 1281 $class->SUPER::new (
1032 col_expand => [], 1282 col_expand => [],
1033 @_ 1283 @_,
1034 ) 1284 )
1285}
1286
1287sub children {
1288 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1035} 1289}
1036 1290
1037sub add { 1291sub add {
1038 my ($self, $x, $y, $child) = @_; 1292 my ($self, $x, $y, $child) = @_;
1039 1293
1040 $child->set_parent ($self); 1294 $child->set_parent ($self);
1041 $self->{children}[$y][$x] = $child; 1295 $self->{children}[$y][$x] = $child;
1042 1296
1043 $child->check_size; 1297 $self->realloc;
1044} 1298}
1045 1299
1046sub children { 1300sub remove {
1047 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1301 my ($self, $child) = @_;
1048}
1049 1302
1303 # TODO: not yet implemented
1304}
1305
1050# 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?
1051sub clear { 1307sub clear {
1052 my ($self) = @_; 1308 my ($self) = @_;
1053 1309
1054 my @children = $self->children; 1310 my @children = $self->children;
1055 delete $self->{children}; 1311 delete $self->{children};
… …
1057 for (@children) { 1313 for (@children) {
1058 delete $_->{parent}; 1314 delete $_->{parent};
1059 $_->hide; 1315 $_->hide;
1060 } 1316 }
1061 1317
1062 $self->update; 1318 $self->realloc;
1063} 1319}
1064 1320
1065sub get_wh { 1321sub get_wh {
1066 my ($self) = @_; 1322 my ($self) = @_;
1067 1323
… …
1093 (sum @$ws), 1349 (sum @$ws),
1094 (sum @$hs), 1350 (sum @$hs),
1095 ) 1351 )
1096} 1352}
1097 1353
1098sub size_allocate { 1354sub invoke_size_allocate {
1099 my ($self, $w, $h) = @_; 1355 my ($self, $w, $h) = @_;
1100 1356
1101 my ($ws, $hs) = $self->get_wh; 1357 my ($ws, $hs) = $self->get_wh;
1102 1358
1103 my $req_w = sum @$ws; 1359 my $req_w = (sum @$ws) || 1;
1104 my $req_h = sum @$hs; 1360 my $req_h = (sum @$hs) || 1;
1105 1361
1106 # TODO: nicer code && do row_expand 1362 # TODO: nicer code && do row_expand
1107 my @col_expand = @{$self->{col_expand}}; 1363 my @col_expand = @{$self->{col_expand}};
1108 @col_expand = (1) x @$ws unless @col_expand; 1364 @col_expand = (1) x @$ws unless @col_expand;
1109 my $col_expand = (sum @col_expand) || 1; 1365 my $col_expand = (sum @col_expand) || 1;
… …
1135 } 1391 }
1136 1392
1137 $y += $row_h; 1393 $y += $row_h;
1138 } 1394 }
1139 1395
1396 1
1140} 1397}
1141 1398
1142sub find_widget { 1399sub find_widget {
1143 my ($self, $x, $y) = @_; 1400 my ($self, $x, $y) = @_;
1144 1401
… …
1163 } 1420 }
1164} 1421}
1165 1422
1166############################################################################# 1423#############################################################################
1167 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
1168package CFClient::UI::HBox; 1485package CFClient::UI::HBox;
1169 1486
1170# TODO: wrap into common Box base class
1171
1172our @ISA = CFClient::UI::Container::; 1487our @ISA = CFClient::UI::Box::;
1173 1488
1174sub size_request { 1489sub new {
1175 my ($self) = @_; 1490 my $class = shift;
1176 1491
1177 my @alloc = map [$_->size_request], @{$self->{children}}; 1492 $class->SUPER::new (
1178 1493 vertical => 0,
1179 ( 1494 @_,
1180 (List::Util::sum map $_->[0], @alloc),
1181 (List::Util::max map $_->[1], @alloc),
1182 ) 1495 )
1183} 1496}
1184 1497
1185sub size_allocate {
1186 my ($self, $w, $h) = @_;
1187
1188 ($h, $w) = ($w, $h);
1189
1190 my $children = $self->{children};
1191
1192 my @h = map $_->{req_w}, @$children;
1193
1194 my $req_h = List::Util::sum @h;
1195
1196 if ($req_h > $h) {
1197 # ah well, not enough space
1198 $_ *= $h / $req_h for @h;
1199 } else {
1200 my $exp = List::Util::sum map $_->{expand}, @$children;
1201 $exp ||= 1;
1202
1203 for (0 .. $#$children) {
1204 my $child = $children->[$_];
1205
1206 my $alloc_h = $h[$_];
1207 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1208 $h[$_] = $alloc_h;
1209 }
1210 }
1211
1212 CFClient::UI::harmonize \@h;
1213
1214 my $y = 0;
1215 for (0 .. $#$children) {
1216 my $child = $children->[$_];
1217 my $h = $h[$_];
1218 $child->configure ($y, 0, $h, $w);
1219
1220 $y += $h;
1221 }
1222
1223 1
1224}
1225
1226############################################################################# 1498#############################################################################
1227 1499
1228package CFClient::UI::VBox; 1500package CFClient::UI::VBox;
1229 1501
1230# TODO: wrap into common Box base class
1231
1232our @ISA = CFClient::UI::Container::; 1502our @ISA = CFClient::UI::Box::;
1233 1503
1234sub size_request { 1504sub new {
1235 my ($self) = @_; 1505 my $class = shift;
1236 1506
1237 my @alloc = map [$_->size_request], @{$self->{children}}; 1507 $class->SUPER::new (
1238 1508 vertical => 1,
1239 ( 1509 @_,
1240 (List::Util::max map $_->[0], @alloc),
1241 (List::Util::sum map $_->[1], @alloc),
1242 ) 1510 )
1243}
1244
1245sub size_allocate {
1246 my ($self, $w, $h) = @_;
1247
1248 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1249
1250 my $children = $self->{children};
1251
1252 my @h = map $_->{req_h}, @$children;
1253
1254 my $req_h = List::Util::sum @h;
1255
1256 if ($req_h > $h) {
1257 # ah well, not enough space
1258 $_ *= $h / $req_h for @h;
1259 } else {
1260 my $exp = List::Util::sum map $_->{expand}, @$children;
1261 $exp ||= 1;
1262
1263 for (0 .. $#$children) {
1264 my $child = $children->[$_];
1265
1266 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1267 }
1268 }
1269
1270 CFClient::UI::harmonize \@h;
1271
1272 my $y = 0;
1273 for (0 .. $#$children) {
1274 my $child = $children->[$_];
1275 my $h = $h[$_];
1276 $child->configure (0, $y, $w, $h);
1277
1278 $y += $h;
1279 }
1280
1281 1
1282} 1511}
1283 1512
1284############################################################################# 1513#############################################################################
1285 1514
1286package CFClient::UI::Label; 1515package CFClient::UI::Label;
… …
1297 #bg => none 1526 #bg => none
1298 #active_bg => none 1527 #active_bg => none
1299 #font => default_font 1528 #font => default_font
1300 #text => initial text 1529 #text => initial text
1301 #markup => initial narkup 1530 #markup => initial narkup
1531 #max_w => maximum pixel width
1532 ellipsise => 3, # end
1302 layout => (new CFClient::Layout), 1533 layout => (new CFClient::Layout),
1303 fontsize => 1, 1534 fontsize => 1,
1304 align => -1, 1535 align => -1,
1305 valign => -1, 1536 valign => -1,
1306 padding => 2, 1537 padding_x => 2,
1538 padding_y => 2,
1307 can_events => 0, 1539 can_events => 0,
1308 %arg 1540 %arg
1309 ); 1541 );
1310 1542
1311 if (exists $self->{template}) { 1543 if (exists $self->{template}) {
… …
1338 1570
1339 delete $self->{texture}; 1571 delete $self->{texture};
1340 $self->SUPER::update; 1572 $self->SUPER::update;
1341} 1573}
1342 1574
1575sub realloc {
1576 my ($self) = @_;
1577
1578 delete $self->{ox};
1579 $self->SUPER::realloc;
1580}
1581
1343sub set_text { 1582sub set_text {
1344 my ($self, $text) = @_; 1583 my ($self, $text) = @_;
1345 1584
1346 return if $self->{text} eq "T$text"; 1585 return if $self->{text} eq "T$text";
1347 $self->{text} = "T$text"; 1586 $self->{text} = "T$text";
1348 1587
1349 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba; 1588 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1350 $self->{layout}->set_text ($text); 1589 $self->{layout}->set_text ($text);
1351 1590
1591 delete $self->{size_req};
1592 $self->realloc;
1352 $self->update; 1593 $self->update;
1353 $self->check_size;
1354} 1594}
1355 1595
1356sub set_markup { 1596sub set_markup {
1357 my ($self, $markup) = @_; 1597 my ($self, $markup) = @_;
1358 1598
… …
1362 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1602 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1363 1603
1364 $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;
1365 $self->{layout}->set_markup ($markup); 1605 $self->{layout}->set_markup ($markup);
1366 1606
1607 delete $self->{size_req};
1608 $self->realloc;
1367 $self->update; 1609 $self->update;
1368 $self->check_size;
1369} 1610}
1370 1611
1371sub size_request { 1612sub size_request {
1372 my ($self) = @_; 1613 my ($self) = @_;
1373 1614
1615 $self->{size_req} ||= do {
1374 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1616 $self->{layout}->set_font ($self->{font}) if $self->{font};
1375 $self->{layout}->set_width ($self->{max_w} || -1); 1617 $self->{layout}->set_width ($self->{max_w} || -1);
1618 $self->{layout}->set_ellipsise ($self->{ellipsise});
1619 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1376 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1620 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1377 1621
1378 my ($w, $h) = $self->{layout}->size; 1622 my ($w, $h) = $self->{layout}->size;
1379 1623
1380 if (exists $self->{template}) { 1624 if (exists $self->{template}) {
1381 $self->{template}->set_font ($self->{font}) if $self->{font}; 1625 $self->{template}->set_font ($self->{font}) if $self->{font};
1382 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1626 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1383 1627
1384 my ($w2, $h2) = $self->{template}->size; 1628 my ($w2, $h2) = $self->{template}->size;
1385 1629
1386 $w = List::Util::max $w, $w2; 1630 $w = List::Util::max $w, $w2;
1387 $h = List::Util::max $h, $h2; 1631 $h = List::Util::max $h, $h2;
1632 }
1633
1634 [$w, $h]
1388 } 1635 };
1389 1636
1390 ( 1637 @{ $self->{size_req} }
1391 $w + $self->{padding} * 2,
1392 $h + $self->{padding} * 2,
1393 )
1394} 1638}
1395 1639
1640sub baseline_shift {
1641 $_[0]{layout}->descent
1642}
1643
1396sub size_allocate { 1644sub invoke_size_allocate {
1397 my ($self, $w, $h) = @_; 1645 my ($self, $w, $h) = @_;
1398 1646
1647 delete $self->{ox};
1648
1399 delete $self->{texture}; 1649 delete $self->{texture}
1650 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1651
1652 1
1400} 1653}
1401 1654
1402sub set_fontsize { 1655sub set_fontsize {
1403 my ($self, $fontsize) = @_; 1656 my ($self, $fontsize) = @_;
1404 1657
1405 $self->{fontsize} = $fontsize; 1658 $self->{fontsize} = $fontsize;
1406 delete $self->{texture}; 1659 delete $self->{texture};
1407 1660
1408 $self->update; 1661 $self->realloc;
1409 $self->check_size; 1662}
1663
1664sub reconfigure {
1665 my ($self) = @_;
1666
1667 delete $self->{size_req};
1668
1669 $self->SUPER::reconfigure;
1410} 1670}
1411 1671
1412sub _draw { 1672sub _draw {
1413 my ($self) = @_; 1673 my ($self) = @_;
1414 1674
… …
1416 1676
1417 my $tex = $self->{texture} ||= do { 1677 my $tex = $self->{texture} ||= do {
1418 $self->{layout}->set_foreground (@{$self->{fg}}); 1678 $self->{layout}->set_foreground (@{$self->{fg}});
1419 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1679 $self->{layout}->set_font ($self->{font}) if $self->{font};
1420 $self->{layout}->set_width ($self->{w}); 1680 $self->{layout}->set_width ($self->{w});
1681 $self->{layout}->set_ellipsise ($self->{ellipsise});
1682 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1421 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1683 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1422 1684
1423 my $tex = new_from_layout CFClient::Texture $self->{layout}; 1685 new_from_layout CFClient::Texture $self->{layout}
1686 };
1424 1687
1688 unless (exists $self->{ox}) {
1425 $self->{ox} = int ($self->{align} < 0 ? $self->{padding} 1689 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1426 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1690 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
1427 : ($self->{w} - $tex->{w}) * 0.5); 1691 : ($self->{w} - $tex->{w}) * 0.5);
1428 1692
1429 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding} 1693 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1430 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1694 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
1431 : ($self->{h} - $tex->{h}) * 0.5); 1695 : ($self->{h} - $tex->{h}) * 0.5);
1432
1433 $tex
1434 }; 1696 };
1435 1697
1436 glEnable GL_TEXTURE_2D; 1698 glEnable GL_TEXTURE_2D;
1437 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};
1438 1702
1439 if ($tex->{format} == GL_ALPHA) { 1703 if ($tex->{format} == GL_ALPHA) {
1704 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1440 glColor @{$self->{fg}}; 1705 glColor @{$self->{fg}};
1441 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}); 1706 $tex->draw_quad_alpha ($self->{ox}, $self->{oy}, $w, $h);
1442 } else { 1707 } else {
1708 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1443 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}); 1709 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy}, $w, $h);
1444 } 1710 }
1445 1711
1446 glDisable GL_TEXTURE_2D; 1712 glDisable GL_TEXTURE_2D;
1447} 1713}
1448 1714
… …
1464 active_fg => [0, 0, 0], 1730 active_fg => [0, 0, 0],
1465 can_hover => 1, 1731 can_hover => 1,
1466 can_focus => 1, 1732 can_focus => 1,
1467 valign => 0, 1733 valign => 0,
1468 can_events => 1, 1734 can_events => 1,
1735 #text => ...
1736 #hidden => "*",
1469 @_ 1737 @_
1470 ) 1738 )
1471} 1739}
1472 1740
1473sub _set_text { 1741sub _set_text {
… …
1475 1743
1476 delete $self->{cur_h}; 1744 delete $self->{cur_h};
1477 1745
1478 return if $self->{text} eq $text; 1746 return if $self->{text} eq $text;
1479 1747
1480 delete $self->{texture};
1481
1482 $self->{last_activity} = $::NOW; 1748 $self->{last_activity} = $::NOW;
1483 $self->{text} = $text; 1749 $self->{text} = $text;
1484 1750
1485 $text =~ s/./*/g if $self->{hidden}; 1751 $text =~ s/./*/g if $self->{hidden};
1486 $self->{layout}->set_text ("$text "); 1752 $self->{layout}->set_text ("$text ");
1753 delete $self->{size_req};
1487 1754
1488 $self->emit (changed => $self->{text}); 1755 $self->emit (changed => $self->{text});
1756
1757 $self->realloc;
1758 $self->update;
1489} 1759}
1490 1760
1491sub set_text { 1761sub set_text {
1492 my ($self, $text) = @_; 1762 my ($self, $text) = @_;
1493 1763
1494 $self->{cursor} = length $text; 1764 $self->{cursor} = length $text;
1495 $self->_set_text ($text); 1765 $self->_set_text ($text);
1496 $self->update;
1497 $self->check_size;
1498} 1766}
1499 1767
1500sub get_text { 1768sub get_text {
1501 $_[0]{text} 1769 $_[0]{text}
1502} 1770}
… …
1507 my ($w, $h) = $self->SUPER::size_request; 1775 my ($w, $h) = $self->SUPER::size_request;
1508 1776
1509 ($w + 1, $h) # add 1 for cursor 1777 ($w + 1, $h) # add 1 for cursor
1510} 1778}
1511 1779
1512sub size_allocate {
1513 my ($self, $w, $h) = @_;
1514
1515 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1516}
1517
1518sub key_down { 1780sub invoke_key_down {
1519 my ($self, $ev) = @_; 1781 my ($self, $ev) = @_;
1520 1782
1521 my $mod = $ev->{mod}; 1783 my $mod = $ev->{mod};
1522 my $sym = $ev->{sym}; 1784 my $sym = $ev->{sym};
1523 my $uni = $ev->{unicode}; 1785 my $uni = $ev->{unicode};
… …
1538 $self->{cursor} = length $text; 1800 $self->{cursor} = length $text;
1539 } elsif ($uni == 27) { 1801 } elsif ($uni == 27) {
1540 $self->emit ('escape'); 1802 $self->emit ('escape');
1541 } elsif ($uni) { 1803 } elsif ($uni) {
1542 substr $text, $self->{cursor}++, 0, chr $uni; 1804 substr $text, $self->{cursor}++, 0, chr $uni;
1805 } else {
1806 return 0;
1543 } 1807 }
1544 1808
1545 $self->_set_text ($text); 1809 $self->_set_text ($text);
1546 $self->update;
1547 $self->check_size;
1548}
1549 1810
1811 $self->realloc;
1812
1813 1
1814}
1815
1550sub focus_in { 1816sub invoke_focus_in {
1551 my ($self) = @_; 1817 my ($self) = @_;
1552 1818
1553 $self->{last_activity} = $::NOW; 1819 $self->{last_activity} = $::NOW;
1554 1820
1555 $self->SUPER::focus_in; 1821 $self->SUPER::invoke_focus_in
1556} 1822}
1557 1823
1558sub button_down { 1824sub invoke_button_down {
1559 my ($self, $ev, $x, $y) = @_; 1825 my ($self, $ev, $x, $y) = @_;
1560 1826
1561 $self->SUPER::button_down ($ev, $x, $y); 1827 $self->SUPER::invoke_button_down ($ev, $x, $y);
1562 1828
1563 my $idx = $self->{layout}->xy_to_index ($x, $y); 1829 my $idx = $self->{layout}->xy_to_index ($x, $y);
1564 1830
1565 # byte-index to char-index 1831 # byte-index to char-index
1566 my $text = $self->{text}; 1832 my $text = $self->{text};
1567 utf8::encode $text; 1833 utf8::encode $text;
1568 $self->{cursor} = length substr $text, 0, $idx; 1834 $self->{cursor} = length substr $text, 0, $idx;
1569 1835
1570 $self->_set_text ($self->{text}); 1836 $self->_set_text ($self->{text});
1571 $self->update; 1837 $self->update;
1838
1839 1
1572} 1840}
1573 1841
1574sub mouse_motion { 1842sub invoke_mouse_motion {
1575 my ($self, $ev, $x, $y) = @_; 1843 my ($self, $ev, $x, $y) = @_;
1576# 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
1577} 1847}
1578 1848
1579sub _draw { 1849sub _draw {
1580 my ($self) = @_; 1850 my ($self) = @_;
1581 1851
1582 local $self->{fg} = $self->{fg}; 1852 local $self->{fg} = $self->{fg};
1583 1853
1584 if ($FOCUS == $self) { 1854 if ($FOCUS == $self) {
1585 glColor @{$self->{active_bg}}; 1855 glColor_premultiply @{$self->{active_bg}};
1586 $self->{fg} = $self->{active_fg}; 1856 $self->{fg} = $self->{active_fg};
1587 } else { 1857 } else {
1588 glColor @{$self->{bg}}; 1858 glColor_premultiply @{$self->{bg}};
1589 } 1859 }
1590 1860
1591 glEnable GL_BLEND; 1861 glEnable GL_BLEND;
1592 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1862 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1593 glBegin GL_QUADS; 1863 glBegin GL_QUADS;
1594 glVertex 0 , 0; 1864 glVertex 0 , 0;
1595 glVertex 0 , $self->{h}; 1865 glVertex 0 , $self->{h};
1596 glVertex $self->{w}, $self->{h}; 1866 glVertex $self->{w}, $self->{h};
1597 glVertex $self->{w}, 0; 1867 glVertex $self->{w}, 0;
… …
1622 1892
1623our @ISA = CFClient::UI::EntryBase::; 1893our @ISA = CFClient::UI::EntryBase::;
1624 1894
1625use CFClient::OpenGL; 1895use CFClient::OpenGL;
1626 1896
1627sub key_down { 1897sub invoke_key_down {
1628 my ($self, $ev) = @_; 1898 my ($self, $ev) = @_;
1629 1899
1630 my $sym = $ev->{sym}; 1900 my $sym = $ev->{sym};
1631 1901
1632 if ($sym == 13) { 1902 if ($sym == 13) {
1633 unshift @{$self->{history}}, 1903 unshift @{$self->{history}},
1634 my $txt = $self->get_text; 1904 my $txt = $self->get_text;
1905
1635 $self->{history_pointer} = -1; 1906 $self->{history_pointer} = -1;
1636 $self->{history_saveback} = ''; 1907 $self->{history_saveback} = '';
1637 $self->emit (activate => $txt); 1908 $self->emit (activate => $txt);
1638 $self->update; 1909 $self->update;
1639 1910
… …
1658 } else { 1929 } else {
1659 $self->set_text ($self->{history_saveback}); 1930 $self->set_text ($self->{history_saveback});
1660 } 1931 }
1661 1932
1662 } else { 1933 } else {
1663 $self->SUPER::key_down ($ev); 1934 return $self->SUPER::invoke_key_down ($ev)
1935 }
1936
1664 } 1937 1
1665
1666} 1938}
1667 1939
1668############################################################################# 1940#############################################################################
1669 1941
1670package CFClient::UI::Button; 1942package CFClient::UI::Button;
… …
1679 1951
1680sub new { 1952sub new {
1681 my $class = shift; 1953 my $class = shift;
1682 1954
1683 $class->SUPER::new ( 1955 $class->SUPER::new (
1684 padding => 4, 1956 padding_x => 4,
1957 padding_y => 4,
1685 fg => [1, 1, 1], 1958 fg => [1, 1, 1],
1686 active_fg => [0, 0, 1], 1959 active_fg => [0, 0, 1],
1687 can_hover => 1, 1960 can_hover => 1,
1688 align => 0, 1961 align => 0,
1689 valign => 0, 1962 valign => 0,
1690 can_events => 1, 1963 can_events => 1,
1691 @_ 1964 @_
1692 ) 1965 )
1693} 1966}
1694 1967
1695sub button_up { 1968sub invoke_button_up {
1696 my ($self, $ev, $x, $y) = @_; 1969 my ($self, $ev, $x, $y) = @_;
1697 1970
1971 $self->emit ("activate")
1698 if ($x >= 0 && $x < $self->{w} 1972 if $x >= 0 && $x < $self->{w}
1699 && $y >= 0 && $y < $self->{h}) { 1973 && $y >= 0 && $y < $self->{h};
1700 $self->emit ("activate"); 1974
1701 } 1975 1
1702} 1976}
1703 1977
1704sub _draw { 1978sub _draw {
1705 my ($self) = @_; 1979 my ($self) = @_;
1706 1980
1707 local $self->{fg} = $self->{fg}; 1981 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1708
1709 if ($GRAB == $self) {
1710 $self->{fg} = $self->{active_fg};
1711 }
1712 1982
1713 glEnable GL_TEXTURE_2D; 1983 glEnable GL_TEXTURE_2D;
1714 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1984 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1715 glColor 0, 0, 0, 1; 1985 glColor 0, 0, 0, 1;
1716 1986
… …
1721 $self->SUPER::_draw; 1991 $self->SUPER::_draw;
1722} 1992}
1723 1993
1724############################################################################# 1994#############################################################################
1725 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
1726package CFClient::UI::CheckBox; 2032package CFClient::UI::CheckBox;
1727 2033
1728our @ISA = CFClient::UI::DrawBG::; 2034our @ISA = CFClient::UI::DrawBG::;
1729 2035
1730my @tex = 2036my @tex =
… …
1735 2041
1736sub new { 2042sub new {
1737 my $class = shift; 2043 my $class = shift;
1738 2044
1739 $class->SUPER::new ( 2045 $class->SUPER::new (
1740 padding => 2, 2046 padding_x => 2,
2047 padding_y => 2,
1741 fg => [1, 1, 1], 2048 fg => [1, 1, 1],
1742 active_fg => [1, 1, 0], 2049 active_fg => [1, 1, 0],
1743 bg => [0, 0, 0, 0.2], 2050 bg => [0, 0, 0, 0.2],
1744 active_bg => [1, 1, 1, 0.5], 2051 active_bg => [1, 1, 1, 0.5],
1745 state => 0, 2052 state => 0,
… …
1749} 2056}
1750 2057
1751sub size_request { 2058sub size_request {
1752 my ($self) = @_; 2059 my ($self) = @_;
1753 2060
1754 ($self->{padding} * 2 + 6) x 2 2061 (6) x 2
1755} 2062}
1756 2063
1757sub button_down { 2064sub invoke_button_down {
1758 my ($self, $ev, $x, $y) = @_; 2065 my ($self, $ev, $x, $y) = @_;
1759 2066
1760 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2067 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1761 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2068 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1762 $self->{state} = !$self->{state}; 2069 $self->{state} = !$self->{state};
1763 $self->emit (changed => $self->{state}); 2070 $self->emit (changed => $self->{state});
2071 } else {
2072 return 0
2073 }
2074
1764 } 2075 1
1765} 2076}
1766 2077
1767sub _draw { 2078sub _draw {
1768 my ($self) = @_; 2079 my ($self) = @_;
1769 2080
1770 $self->SUPER::_draw; 2081 $self->SUPER::_draw;
1771 2082
1772 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2083 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1773 2084
1774 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;
1775 2088
1776 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2089 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1777 2090
1778 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2091 my $tex = $self->{state} ? $tex[1] : $tex[0];
1779 2092
… …
1787package CFClient::UI::Image; 2100package CFClient::UI::Image;
1788 2101
1789our @ISA = CFClient::UI::Base::; 2102our @ISA = CFClient::UI::Base::;
1790 2103
1791use CFClient::OpenGL; 2104use CFClient::OpenGL;
1792use Carp qw/confess/;
1793 2105
1794our %loaded_images; 2106our %texture_cache;
1795 2107
1796sub new { 2108sub new {
1797 my $class = shift; 2109 my $class = shift;
1798 2110
1799 my $self = $class->SUPER::new (can_events => 0, @_); 2111 my $self = $class->SUPER::new (
2112 can_events => 0,
2113 @_,
2114 );
1800 2115
1801 $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";
1802 2118
1803 $loaded_images{$self->{image}} ||= 2119 $self->{tex} = $texture_cache{$self->{path}} ||=
1804 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;
1805 2121
1806 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2122 Scalar::Util::weaken $texture_cache{$self->{path}};
1807 2123
1808 Scalar::Util::weaken $loaded_images{$self->{image}}; 2124 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1809
1810 $self->{aspect} = $tex->{w} / $tex->{h};
1811 2125
1812 $self 2126 $self
1813} 2127}
1814 2128
1815sub size_request { 2129sub size_request {
1816 my ($self) = @_; 2130 my ($self) = @_;
1817 2131
1818 ($self->{tex}->{w}, $self->{tex}->{h}) 2132 ($self->{tex}{w}, $self->{tex}{h})
1819} 2133}
1820 2134
1821sub _draw { 2135sub _draw {
1822 my ($self) = @_; 2136 my ($self) = @_;
1823 2137
… …
1934 2248
1935 my $h1 = $self->{h} * (1 - $ycut1); 2249 my $h1 = $self->{h} * (1 - $ycut1);
1936 my $h2 = $self->{h} * (1 - $ycut2); 2250 my $h2 = $self->{h} * (1 - $ycut2);
1937 2251
1938 glEnable GL_BLEND; 2252 glEnable GL_BLEND;
1939 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;
1940 glEnable GL_TEXTURE_2D; 2255 glEnable GL_TEXTURE_2D;
1941 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2256 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1942 2257
1943 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2258 glBindTexture GL_TEXTURE_2D, $t1->{name};
1944 glBegin GL_QUADS; 2259 glBegin GL_QUADS;
… …
2043 my $self = $class->SUPER::new ( 2358 my $self = $class->SUPER::new (
2044 fg => [1, 1, 1], 2359 fg => [1, 1, 1],
2045 active_fg => [0, 0, 0], 2360 active_fg => [0, 0, 0],
2046 bg => [0, 0, 0, 0.2], 2361 bg => [0, 0, 0, 0.2],
2047 active_bg => [1, 1, 1, 0.5], 2362 active_bg => [1, 1, 1, 0.5],
2048 range => [0, 0, 100, 10], 2363 range => [0, 0, 100, 10, 0],
2049 req_w => $::WIDTH / 80, 2364 min_w => $::WIDTH / 80,
2050 req_h => $::WIDTH / 80, 2365 min_h => $::WIDTH / 80,
2051 vertical => 0, 2366 vertical => 0,
2052 can_hover => 1, 2367 can_hover => 1,
2053 inner_pad => .05, 2368 inner_pad => 0.02,
2054 @_ 2369 @_
2055 ); 2370 );
2056 2371
2057 $self->set_value ($self->{range}[0]); 2372 $self->set_value ($self->{range}[0]);
2058 $self->update; 2373 $self->update;
2059 2374
2060 $self 2375 $self
2061} 2376}
2062 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
2063sub set_value { 2389sub set_value {
2064 my ($self, $value) = @_; 2390 my ($self, $value) = @_;
2065 2391
2066 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 2392 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2067 2393
2068 $hi = $lo + 1 if $hi <= $lo; 2394 $hi = $lo + 1 if $hi <= $lo;
2069 2395
2396 $page = $hi - $lo if $page > $hi - $lo;
2397
2070 $value = $lo if $value < $lo; 2398 $value = $lo if $value < $lo;
2071 $value = $hi if $value > $hi; 2399 $value = $hi - $page if $value > $hi - $page;
2072 2400
2073 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 2401 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2074 if $unit; 2402 if $unit;
2075
2076 $page = $hi - $lo if $page > $hi - $lo;
2077 2403
2078 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 2404 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2079 2405
2080 if ($value != $old_value) { 2406 if ($value != $old_value) {
2081 $self->emit (changed => $value); 2407 $self->emit (changed => $value);
… …
2084} 2410}
2085 2411
2086sub size_request { 2412sub size_request {
2087 my ($self) = @_; 2413 my ($self) = @_;
2088 2414
2089 my $w = $self->{req_w}; 2415 ($self->{req_w}, $self->{req_h})
2090 my $h = $self->{req_h};
2091
2092 $self->{vertical} ? ($h, $w) : ($w, $h)
2093} 2416}
2094 2417
2095sub button_down { 2418sub invoke_button_down {
2096 my ($self, $ev, $x, $y) = @_; 2419 my ($self, $ev, $x, $y) = @_;
2097 2420
2098 $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
2099 $self->mouse_motion ($ev, $x, $y); 2425 $self->invoke_mouse_motion ($ev, $x, $y)
2100} 2426}
2101 2427
2102sub mouse_motion { 2428sub invoke_mouse_motion {
2103 my ($self, $ev, $x, $y) = @_; 2429 my ($self, $ev, $x, $y) = @_;
2104 2430
2105 if ($GRAB == $self) { 2431 if ($GRAB == $self) {
2106 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2432 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2107 2433
2108 my (undef, $lo, $hi, $page) = @{$self->{range}}; 2434 my (undef, $lo, $hi, $page) = @{$self->{range}};
2109 2435
2110 $x = $x / ($w * (1 - 2 * $self->{inner_pad})) - $self->{inner_pad}; 2436 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2111 2437
2112 $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
2113 } 2443 1
2114} 2444}
2115 2445
2116sub update { 2446sub update {
2117 my ($self) = @_; 2447 my ($self) = @_;
2118 2448
2119 $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}) {
2120 $self->set_value ($self->{range}[0]); 2457 $self->set_value ($self->{range}[0]);
2121 2458
2122 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2459 my ($value, $lo, $hi, $page) = @{$self->{range}};
2460 my $range = ($hi - $page - $lo) || 1e-100;
2123 2461
2124 my $inner_w = 1 - 2 * $self->{inner_pad}; 2462 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
2125 2463
2126 $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;
2127 2466
2128 $page = $self->{scale} * $page || 10 / ($self->{w} || 1); 2467 $value = ($value - $lo) / $range;
2129 $value = $self->{scale} * ($value - $lo); 2468 $value = $value * $self->{scale} + $self->{offset};
2130 2469
2131 $value = $self->{inner_pad} + ($value - $page * 0.5);
2132
2133 $value = 0 if $value < 0;
2134 $page = 1 - $value if $value + $page > 1;
2135
2136 $self->{knob_x} = $value; 2470 $self->{knob_x} = $value - $knob_w * 0.5;
2137 $self->{knob_w} = $page; 2471 $self->{knob_w} = $knob_w;
2138 }); 2472 }
2139
2140 $self->SUPER::update;
2141}
2142
2143sub _draw {
2144 my ($self) = @_;
2145 2473
2146 $self->SUPER::_draw (); 2474 $self->SUPER::_draw ();
2147 2475
2148 glScale $self->{w}, $self->{h}; 2476 glScale $self->{w}, $self->{h};
2149 2477
2150 if ($self->{vertical}) { 2478 if ($self->{vertical}) {
2151 # draw a vertical slider like a rotated horizontal slider 2479 # draw a vertical slider like a rotated horizontal slider
2152 2480
2481 glTranslate 1, 0, 0;
2153 glRotate 90, 0, 0, 1; 2482 glRotate 90, 0, 0, 1;
2154 glTranslate 0, 1, 0;
2155 } 2483 }
2156 2484
2157 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2485 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2158 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2486 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2159 2487
… …
2169 glDisable GL_TEXTURE_2D; 2497 glDisable GL_TEXTURE_2D;
2170} 2498}
2171 2499
2172############################################################################# 2500#############################################################################
2173 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
2174package CFClient::UI::TextView; 2543package CFClient::UI::TextScroller;
2175 2544
2176our @ISA = CFClient::UI::HBox::; 2545our @ISA = CFClient::UI::HBox::;
2177 2546
2178use CFClient::OpenGL; 2547use CFClient::OpenGL;
2179 2548
… …
2181 my $class = shift; 2550 my $class = shift;
2182 2551
2183 my $self = $class->SUPER::new ( 2552 my $self = $class->SUPER::new (
2184 fontsize => 1, 2553 fontsize => 1,
2185 can_events => 0, 2554 can_events => 0,
2555 indent => 0,
2186 #font => default_font 2556 #font => default_font
2187 @_, 2557 @_,
2188 2558
2189 layout => (new CFClient::Layout 1), 2559 layout => (new CFClient::Layout 1),
2190 par => [], 2560 par => [],
… …
2205 2575
2206 $self->{fontsize} = $fontsize; 2576 $self->{fontsize} = $fontsize;
2207 $self->reflow; 2577 $self->reflow;
2208} 2578}
2209 2579
2210sub text_height { 2580sub visible_children {
2581 my ($self) = @_;
2582
2583 @{$self->{children}}[0,1]
2584}
2585
2586sub invoke_size_allocate {
2587 my ($self, $w, $h) = @_;
2588
2589 my ($empty, $slider, @other) = @{ $self->{children} };
2590 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2591
2592 $self->{layout}->set_font ($self->{font}) if $self->{font};
2593 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2594 $self->{layout}->set_width ($empty->{w});
2595 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2596
2597 $self->reflow;
2598
2599 $self->SUPER::invoke_size_allocate ($w, $h)
2600}
2601
2602sub get_layout {
2211 my ($self, $text) = @_; 2603 my ($self, $para) = @_;
2212 2604
2213 my $layout = $self->{layout}; 2605 my $layout = $self->{layout};
2214 2606
2607 $layout->set_font ($self->{font}) if $self->{font};
2608 $layout->set_foreground (@{$para->{fg}});
2215 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2609 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2216 $layout->set_width ($self->{children}[0]{w}); 2610 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2611 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2217 $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}}
2218 2618 );
2219 ($layout->size)[1] 2619
2620 $layout
2220} 2621}
2221 2622
2222sub reflow { 2623sub reflow {
2223 my ($self) = @_; 2624 my ($self) = @_;
2224 2625
2225 $self->{need_reflow}++; 2626 $self->{need_reflow}++;
2226 $self->update; 2627 $self->update;
2227} 2628}
2228 2629
2229sub size_allocate { 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 {
2230 my ($self, $w, $h) = @_; 2638 my ($self) = @_;
2231 2639
2232 $self->SUPER::size_allocate ($w, $h); 2640 my (undef, undef, @other) = @{ $self->{children} };
2641 $self->remove ($_) for @other;
2233 2642
2234 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2643 $self->{par} = [];
2235 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2644 $self->{height} = 0;
2236 $self->{layout}->set_width ($self->{children}[0]{w}); 2645 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2237
2238 $self->reflow;
2239} 2646}
2240 2647
2241sub add_paragraph { 2648sub add_paragraph {
2242 my ($self, $color, $text) = @_; 2649 my ($self, $color, $para, $indent) = @_;
2243 2650
2244 #TODO: intelligently "reformat" paragraph 2651 my ($text, @w) = ref $para ? @$para : $para;
2245 2652
2246 my $height = $self->text_height ($text); 2653 $para = {
2654 w => 1e10,
2655 wrapped => 1,
2656 fg => $color,
2657 indent => $indent,
2658 markup => $text,
2659 widget => \@w,
2660 };
2247 2661
2248 $self->{height} += $height; 2662 $self->add (@w) if @w;
2663 push @{$self->{par}}, $para;
2249 2664
2250 push @{$self->{par}}, [$height, $color, $text]; 2665 $self->{need_reflow}++;
2666 $self->update;
2667}
2251 2668
2252 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2669sub scroll_to_bottom {
2253 $self->{children}[1]->update; 2670 my ($self) = @_;
2671
2672 $self->{scroll_to_bottom} = 1;
2673 $self->update;
2254} 2674}
2255 2675
2256sub update { 2676sub update {
2257 my ($self) = @_; 2677 my ($self) = @_;
2258 2678
… …
2260 2680
2261 return unless $self->{h} > 0; 2681 return unless $self->{h} > 0;
2262 2682
2263 delete $self->{texture}; 2683 delete $self->{texture};
2264 2684
2265 $ROOT->on_post_alloc ($self, sub { 2685 $ROOT->on_post_alloc ($self => sub {
2686 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2687
2266 if (delete $self->{need_reflow}) { 2688 if (delete $self->{need_reflow}) {
2267 my $height = 0; 2689 my $height = 0;
2268 2690
2269 $height += $_->[0] = $self->text_height ($_->[2])
2270 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 }
2271 2703
2272 $self->{height} = $height; 2704 $self->{height} = $height;
2273 2705
2274 $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]);
2275 2707
2276 delete $self->{texture}; 2708 delete $self->{texture};
2277 } 2709 }
2278 2710
2711 if (delete $self->{scroll_to_bottom}) {
2712 $self->{children}[1]->set_value (1e10);
2713 }
2714
2279 $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 {
2280 glClearColor 0, 0, 0, 0; 2716 glClearColor 0, 0, 0, 0;
2281 glClear GL_COLOR_BUFFER_BIT; 2717 glClear GL_COLOR_BUFFER_BIT;
2282 2718
2283 glEnable GL_TEXTURE_2D;
2284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2285
2286 my $top = int $self->{children}[1]{range}[0]; 2719 my $top = int $self->{children}[1]{range}[0];
2287 2720
2288 my $y0 = $top; 2721 my $y0 = $top;
2289 my $y1 = $top + $self->{h}; 2722 my $y1 = $top + $H;
2290 2723
2291 my $y = 0; 2724 my $y = 0;
2292 2725
2293 my $layout = $self->{layout}; 2726 glEnable GL_BLEND;
2727 #TODO# not correct in windows where rgba is forced off
2728 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2294 2729
2295 $layout->set_font ($self->{font}) if $self->{font};
2296
2297 for my $par (@{$self->{par}}) { 2730 for my $para (@{$self->{par}}) {
2298 my $h = $par->[0]; 2731 my $h = $para->{h};
2299 2732
2300 if ($y0 < $y + $h && $y < $y1) { 2733 if ($y0 < $y + $h && $y < $y1) {
2301 $layout->set_foreground (@{ $par->[1] });
2302 $layout->set_markup ($par->[2]);
2303 2734
2304 my ($W, $H) = $layout->size; 2735 my $layout = $self->get_layout ($para);
2305 CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0); 2736
2737 my ($w, $h, $data, $format, $internalformat) = $layout->render;
2738
2739 glRasterPos $para->{indent}, $y - $y0;
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 }
2306 } 2754 }
2307 2755
2308 $y += $h; 2756 $y += $h;
2309 } 2757 }
2310 2758
2311 glDisable GL_TEXTURE_2D; 2759 glDisable GL_BLEND;
2312 }; 2760 };
2313 }); 2761 });
2314} 2762}
2315 2763
2764sub reconfigure {
2765 my ($self) = @_;
2766
2767 $self->SUPER::reconfigure;
2768
2769 $_->{w} = 1e10 for @{ $self->{par} };
2770 $self->reflow;
2771}
2772
2316sub _draw { 2773sub _draw {
2317 my ($self) = @_; 2774 my ($self) = @_;
2318 2775
2319 glEnable GL_TEXTURE_2D; 2776 glEnable GL_TEXTURE_2D;
2320 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2321 glColor 1, 1, 1, 1; 2778 glColor 0, 0, 0, 1;
2322 $self->{texture}->draw_quad_alpha_premultiplied (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});
2323 glDisable GL_TEXTURE_2D; 2780 glDisable GL_TEXTURE_2D;
2324 2781
2325 $self->{children}[1]->draw; 2782 $self->{children}[1]->draw;
2326
2327} 2783}
2328 2784
2329############################################################################# 2785#############################################################################
2330 2786
2331package CFClient::UI::Animator; 2787package CFClient::UI::Animator;
… …
2376 2832
2377sub new { 2833sub new {
2378 my $class = shift; 2834 my $class = shift;
2379 2835
2380 my $self = $class->SUPER::new ( 2836 my $self = $class->SUPER::new (
2381 state => 0, 2837 state => 0,
2382 connect_activate => \&toggle_flopper, 2838 on_activate => \&toggle_flopper,
2383 @_ 2839 @_
2384 ); 2840 );
2385 2841
2386 if ($self->{state}) {
2387 $self->{state} = 0;
2388 $self->toggle_flopper;
2389 }
2390
2391 $self 2842 $self
2392} 2843}
2393 2844
2394sub toggle_flopper { 2845sub toggle_flopper {
2395 my ($self) = @_; 2846 my ($self) = @_;
2396 2847
2397 # TODO: use animation 2848 $self->{other}->toggle_visibility;
2398 if ($self->{state} = !$self->{state}) {
2399 $CFClient::UI::ROOT->add ($self->{other});
2400 $self->{other}->move ($self->coord2global (0, $self->{h}));
2401 $self->emit ("open");
2402 } else {
2403 $CFClient::UI::ROOT->remove ($self->{other});
2404 $self->emit ("close");
2405 }
2406
2407 $self->emit (changed => $self->{state});
2408} 2849}
2409 2850
2410############################################################################# 2851#############################################################################
2411 2852
2412package CFClient::UI::Tooltip; 2853package CFClient::UI::Tooltip;
… …
2425} 2866}
2426 2867
2427sub set_tooltip_from { 2868sub set_tooltip_from {
2428 my ($self, $widget) = @_; 2869 my ($self, $widget) = @_;
2429 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
2430 $self->add (new CFClient::UI::Label 2883 $self->add (new CFClient::UI::Label
2431 markup => $widget->{tooltip}, 2884 markup => $tooltip,
2432 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 2885 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2433 fontsize => 0.8, 2886 fontsize => 0.8,
2434 fg => [0, 0, 0, 1], 2887 fg => [0, 0, 0, 1],
2888 ellipsise => 0,
2435 font => ($widget->{tooltip_font} || $::FONT_PROP), 2889 font => ($widget->{tooltip_font} || $::FONT_PROP),
2436 ); 2890 );
2437} 2891}
2438 2892
2439sub size_request { 2893sub size_request {
2440 my ($self) = @_; 2894 my ($self) = @_;
… …
2442 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 2896 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2443 2897
2444 ($w + 4, $h + 4) 2898 ($w + 4, $h + 4)
2445} 2899}
2446 2900
2447sub size_allocate { 2901sub invoke_size_allocate {
2448 my ($self, $w, $h) = @_; 2902 my ($self, $w, $h) = @_;
2449 2903
2450 $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 });
2451} 2923}
2452 2924
2453sub _draw { 2925sub _draw {
2454 my ($self) = @_; 2926 my ($self) = @_;
2455 2927
… …
2472 glVertex $w, $h; 2944 glVertex $w, $h;
2473 glVertex $w, 0; 2945 glVertex $w, 0;
2474 glEnd; 2946 glEnd;
2475 2947
2476 glTranslate 2 - 0.375, 2 - 0.375; 2948 glTranslate 2 - 0.375, 2 - 0.375;
2949
2477 $self->SUPER::_draw; 2950 $self->SUPER::_draw;
2478} 2951}
2479 2952
2480############################################################################# 2953#############################################################################
2481 2954
… …
2486use CFClient::OpenGL; 2959use CFClient::OpenGL;
2487 2960
2488sub new { 2961sub new {
2489 my $class = shift; 2962 my $class = shift;
2490 2963
2491 $class->SUPER::new ( 2964 my $self = $class->SUPER::new (
2492 aspect => 1, 2965 aspect => 1,
2966 can_events => 0,
2493 @_, 2967 @_,
2494 ) 2968 );
2969
2970 if ($self->{anim} && $self->{animspeed}) {
2971 Scalar::Util::weaken (my $widget = $self);
2972
2973 $self->{timer} = Event->timer (
2974 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2975 hard => 1,
2976 interval => $self->{animspeed},
2977 cb => sub {
2978 ++$widget->{frame};
2979 $widget->update;
2980 },
2981 );
2982 }
2983
2984 $self
2495} 2985}
2496 2986
2497sub size_request { 2987sub size_request {
2498 (32, 8) 2988 (32, 8)
2499} 2989}
2500 2990
2991sub update {
2992 my ($self) = @_;
2993
2994 return unless $self->{visible};
2995
2996 $self->SUPER::update;
2997}
2998
2501sub _draw { 2999sub _draw {
2502 my ($self) = @_; 3000 my ($self) = @_;
2503 3001
2504 return unless $::CONN;#d# manage and cache textures differently 3002 return unless $::CONN;
3003
3004 my $face;
3005
3006 if ($self->{frame}) {
3007 my $anim = $::CONN->{anim}[$self->{anim}];
3008
3009 $face = $anim->[ $self->{frame} % @$anim ]
3010 if $anim && @$anim;
3011 }
3012
2505 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3013 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2506 3014
2507 # TODO animation
2508 if ($tex) { 3015 if ($tex) {
2509 glEnable GL_TEXTURE_2D; 3016 glEnable GL_TEXTURE_2D;
2510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3017 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2511 glColor 1, 1, 1, 1; 3018 glColor 0, 0, 0, 1;
2512 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3019 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2513 glDisable GL_TEXTURE_2D; 3020 glDisable GL_TEXTURE_2D;
2514 } 3021 }
2515} 3022}
2516 3023
3024sub destroy {
3025 my ($self) = @_;
3026
3027 $self->{timer}->cancel
3028 if $self->{timer};
3029
3030 $self->SUPER::destroy;
3031}
3032
2517############################################################################# 3033#############################################################################
2518 3034
2519package CFClient::UI::InventoryItem; 3035package CFClient::UI::Buttonbar;
2520 3036
2521our @ISA = CFClient::UI::HBox::; 3037our @ISA = CFClient::UI::HBox::;
2522 3038
2523sub _item_to_desc { 3039# TODO: should actualyl wrap buttons and other goodies.
2524 my ($item) = @_;
2525
2526 my $desc =
2527 $item->{nrof} < 2
2528 ? $item->{name}
2529 : "$item->{nrof} $item->{name_pl}";
2530
2531 $item->{flags} & Crossfire::Protocol::F_OPEN
2532 and $desc .= " (open)";
2533 $item->{flags} & Crossfire::Protocol::F_APPLIED
2534 and $desc .= " (applied)";
2535 $item->{flags} & Crossfire::Protocol::F_UNPAID
2536 and $desc .= " (unpaid)";
2537 $item->{flags} & Crossfire::Protocol::F_MAGIC
2538 and $desc .= " (magic)";
2539 $item->{flags} & Crossfire::Protocol::F_CURSED
2540 and $desc .= " (cursed)";
2541 $item->{flags} & Crossfire::Protocol::F_DAMNED
2542 and $desc .= " (damned)";
2543 $item->{flags} & Crossfire::Protocol::F_LOCKED
2544 and $desc .= " *";
2545
2546 $desc
2547}
2548
2549sub new {
2550 my $class = shift;
2551
2552 my %args = @_;
2553
2554 my $item = delete $args{item};
2555
2556 my $desc = _item_to_desc ($item);
2557
2558 my $self = $class->SUPER::new (
2559 can_hover => 1,
2560 can_events => 1,
2561 tooltip => ((CFClient::UI::Label::escape $desc)
2562 . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
2563 connect_button_down => sub {
2564 my ($self, $ev, $x, $y) = @_;
2565
2566 # todo: maybe put examine on 1? but should just be a tooltip :(
2567 if ($ev->{button} == 1) {
2568 my $targ = $::CONN->{player}{tag};
2569
2570 if ($item->{container} == $::CONN->{player}{tag}) {
2571 $targ = $main::OPENCONT;
2572 }
2573
2574 $::CONN->send ("move $targ $item->{tag} 0");
2575 } elsif ($ev->{button} == 2) {
2576 $::CONN->send ("apply $item->{tag}");
2577 } elsif ($ev->{button} == 3) {
2578 my @menu_items = (
2579 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2580 ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
2581 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2582 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2583 [
2584 $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
2585 sub { $::CONN->send ("lock $item->{tag}") },
2586 ],
2587 );
2588
2589 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2590 }
2591
2592 1
2593 },
2594 %args
2595 );
2596
2597
2598 $self->add (new CFClient::UI::Face
2599 can_events => 0,
2600 face => $item->{face},
2601 anim => $item->{anim},
2602 animspeed => $item->{animspeed},
2603 );
2604
2605 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2606
2607 $self->{item} = $item;
2608
2609 $self->update_item;
2610
2611 $self
2612}
2613
2614sub update_item {
2615 my ($self) = @_;
2616
2617 my $desc = _item_to_desc ($self->{item});
2618
2619 $self->{name_lbl}->set_text ($desc);
2620}
2621
2622#############################################################################
2623
2624package CFClient::UI::Inventory;
2625
2626our @ISA = CFClient::UI::ScrolledWindow::;
2627
2628sub new {
2629 my $class = shift;
2630
2631 my $self = $class->SUPER::new (
2632 scrolled => (new CFClient::UI::VBox),
2633 @_,
2634 );
2635
2636 $self
2637}
2638
2639sub set_items {
2640 my ($self, $items) = @_;
2641
2642 $self->{scrolled}->clear;
2643 return unless $items;
2644
2645 my @items = sort {
2646 ($a->{type} <=> $b->{type})
2647 or ($a->{name} cmp $b->{name})
2648 } @$items;
2649
2650 $self->{real_items} = \@items;
2651
2652 for my $item (@items) {
2653 $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
2654 $item->update_item ();
2655 }
2656
2657 $self->{scrolled}->add (@items);
2658
2659# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2660}
2661
2662sub size_request {
2663 my ($self) = @_;
2664 ($self->{req_w}, $self->{req_h});
2665}
2666 3040
2667############################################################################# 3041#############################################################################
2668 3042
2669package CFClient::UI::Menu; 3043package CFClient::UI::Menu;
2670 3044
… …
2682 ); 3056 );
2683 3057
2684 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3058 $self->add ($self->{vbox} = new CFClient::UI::VBox);
2685 3059
2686 for my $item (@{ $self->{items} }) { 3060 for my $item (@{ $self->{items} }) {
2687 my ($widget, $cb) = @$item; 3061 my ($widget, $cb, $tooltip) = @$item;
2688 3062
2689 # handle various types of items, only text for now 3063 # handle various types of items, only text for now
2690 if (!ref $widget) { 3064 if (!ref $widget) {
2691 $widget = new CFClient::UI::Label 3065 $widget = new CFClient::UI::Label
2692 can_hover => 1, 3066 can_hover => 1,
2693 can_events => 1, 3067 can_events => 1,
2694 text => $widget; 3068 markup => $widget,
3069 tooltip => $tooltip
2695 } 3070 }
2696 3071
2697 $self->{item}{$widget} = $item; 3072 $self->{item}{$widget} = $item;
2698 3073
2699 $self->{vbox}->add ($widget); 3074 $self->{vbox}->add ($widget);
… …
2711 # maybe save $GRAB? must be careful about events... 3086 # maybe save $GRAB? must be careful about events...
2712 $GRAB = $self; 3087 $GRAB = $self;
2713 $self->{button} = $ev->{button}; 3088 $self->{button} = $ev->{button};
2714 3089
2715 $self->show; 3090 $self->show;
2716 $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);
2717} 3092}
2718 3093
2719sub mouse_motion { 3094sub invoke_mouse_motion {
2720 my ($self, $ev, $x, $y) = @_; 3095 my ($self, $ev, $x, $y) = @_;
2721 3096
2722 # TODO: should use vbox->find_widget or so 3097 # TODO: should use vbox->find_widget or so
2723 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3098 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2724 $self->{hover} = $self->{item}{$HOVER}; 3099 $self->{hover} = $self->{item}{$HOVER};
2725}
2726 3100
3101 0
3102}
3103
2727sub button_up { 3104sub invoke_button_up {
2728 my ($self, $ev, $x, $y) = @_; 3105 my ($self, $ev, $x, $y) = @_;
2729 3106
2730 if ($ev->{button} == $self->{button}) { 3107 if ($ev->{button} == $self->{button}) {
2731 undef $GRAB; 3108 undef $GRAB;
2732 $self->hide; 3109 $self->hide;
2733 3110
2734 $self->emit ("popdown"); 3111 $self->emit ("popdown");
2735 $self->{hover}[1]->() if $self->{hover}; 3112 $self->{hover}[1]->() if $self->{hover};
3113 } else {
3114 return 0
3115 }
3116
2736 } 3117 1
2737} 3118}
2738 3119
2739############################################################################# 3120#############################################################################
2740 3121
2741package CFClient::UI::Statusbox; 3122package CFClient::UI::Multiplexer;
2742 3123
2743our @ISA = CFClient::UI::VBox::; 3124our @ISA = CFClient::UI::Container::;
2744 3125
2745sub new { 3126sub new {
2746 my $class = shift; 3127 my $class = shift;
2747 3128
2748 $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 (
2749 fontsize => 0.8, 3296 fontsize => 0.8,
2750 @_, 3297 @_,
2751 ) 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
2752} 3305}
2753 3306
2754sub reorder { 3307sub reorder {
2755 my ($self) = @_; 3308 my ($self) = @_;
2756 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} };
2757 3315
2758 while (my ($k, $v) = each %{ $self->{item} }) { 3316 while (my ($k, $v) = each %{ $self->{item} }) {
2759 delete $self->{item}{$k} if $v->{timeout} < $NOW; 3317 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2760 } 3318 }
2761 3319
… …
2764 my @items = sort { 3322 my @items = sort {
2765 $a->{pri} <=> $b->{pri} 3323 $a->{pri} <=> $b->{pri}
2766 or $b->{id} <=> $a->{id} 3324 or $b->{id} <=> $a->{id}
2767 } values %{ $self->{item} }; 3325 } values %{ $self->{item} };
2768 3326
3327 $self->{timer}->interval (1);
3328
2769 my $count = 10 + 1; 3329 my $count = 10 + 1;
2770 for my $item (@items) { 3330 for my $item (@items) {
2771 last unless --$count; 3331 last unless --$count;
2772 3332
2773 push @widgets, $item->{label} ||= do { 3333 my $label = $item->{label} ||= do {
2774 # TODO: doesn't handle markup well (read as: at all) 3334 # TODO: doesn't handle markup well (read as: at all)
2775 my $short = $item->{count} > 1 3335 my $short = $item->{count} > 1
2776 ? "<b>$item->{count} ×</b> $item->{text}" 3336 ? "<b>$item->{count} ×</b> $item->{text}"
2777 : $item->{text}; 3337 : $item->{text};
2778 3338
2779 my $fontsize = $item->{fontsize} || $self->{fontsize};
2780
2781 for ($short) { 3339 for ($short) {
2782 s/^\s+//; 3340 s/^\s+//;
2783 s/\s+/ /g; 3341 s/\s+/ /g;
2784 my $len = int 40 / $fontsize;
2785 substr $_, $len, length, "…" if $len < length;
2786 } 3342 }
2787 3343
2788 new CFClient::UI::Label 3344 new CFClient::UI::Label
2789 markup => $short, 3345 markup => $short,
2790 tooltip => $item->{tooltip}, 3346 tooltip => $item->{tooltip},
2791 tooltip_font => $::FONT_PROP, 3347 tooltip_font => $::FONT_PROP,
2792 tooltip_width => 0.67, 3348 tooltip_width => 0.67,
2793 fontsize => $fontsize, 3349 fontsize => $item->{fontsize} || $self->{fontsize},
3350 max_w => $::WIDTH * 0.44,
2794 fg => $item->{fg}, 3351 fg => [@{ $item->{fg} }],
2795 can_events => 1, 3352 can_events => 1,
2796 can_hover => 1 3353 can_hover => 1
2797 }; 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;
2798 } 3367 }
2799 3368
2800 $self->clear; 3369 $self->clear;
2801 $self->SUPER::add (reverse @widgets); 3370 $self->SUPER::add (reverse @widgets);
2802} 3371}
… …
2805 my ($self, $text, %arg) = @_; 3374 my ($self, $text, %arg) = @_;
2806 3375
2807 $text =~ s/^\s+//; 3376 $text =~ s/^\s+//;
2808 $text =~ s/\s+$//; 3377 $text =~ s/\s+$//;
2809 3378
3379 return unless $text;
3380
2810 my $timeout = time + ((delete $arg{timeout}) || 60); 3381 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2811 3382
2812 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 3383 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2813 3384
2814 if (my $item = $self->{item}{$group}) { 3385 if (my $item = $self->{item}{$group}) {
2815 if ($item->{text} eq $text) { 3386 if ($item->{text} eq $text) {
2816 $item->{count}++; 3387 $item->{count}++;
2817 } else { 3388 } else {
2818 $item->{count} = 1; 3389 $item->{count} = 1;
2819 $item->{text} = $item->{tooltip} = $text; 3390 $item->{text} = $item->{tooltip} = $text;
2820 } 3391 }
2821 $item->{id} = ++$self->{id}; 3392 $item->{id} += 0.2;#d#
2822 $item->{timeout} = $timeout; 3393 $item->{timeout} = $timeout;
2823 delete $item->{label}; 3394 delete $item->{label};
2824 } else { 3395 } else {
2825 $self->{item}{$group} = { 3396 $self->{item}{$group} = {
2826 id => ++$self->{id}, 3397 id => ++$self->{id},
… …
2835 } 3406 }
2836 3407
2837 $self->reorder; 3408 $self->reorder;
2838} 3409}
2839 3410
3411sub reconfigure {
3412 my ($self) = @_;
3413
3414 delete $_->{label}
3415 for values %{ $self->{item} || {} };
3416
3417 $self->reorder;
3418 $self->SUPER::reconfigure;
3419}
3420
3421sub destroy {
3422 my ($self) = @_;
3423
3424 $self->{timer}->cancel;
3425
3426 $self->SUPER::destroy;
3427}
3428
2840############################################################################# 3429#############################################################################
2841 3430
2842package CFClient::UI::Root; 3431package CFClient::UI::Inventory;
2843 3432
2844our @ISA = CFClient::UI::Container::; 3433our @ISA = CFClient::UI::ScrolledWindow::;
2845
2846use CFClient::OpenGL;
2847 3434
2848sub new { 3435sub new {
2849 my $class = shift; 3436 my $class = shift;
2850 3437
2851 $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 => [],
2852 @_, 3691 @_,
2853 ) 3692 )
2854} 3693}
2855 3694
2856sub configure { 3695my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
2857 my ($self, $x, $y, $w, $h) = @_;
2858 3696
2859 $self->{w} = $w; 3697my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
2860 $self->{h} = $h; 3698 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
2861} 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");
2862 3707
2863sub 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 {
2864 my ($self) = @_; 3781 my ($self, $spell) = @_;
2865 3782
2866 $self->size_allocate ($self->{w}, $self->{h}) 3783 $self->{spell}->{$spell->{name}} = $spell;
2867 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
2868} 3822}
2869 3823
2870sub size_request { 3824sub size_request {
2871 my ($self) = @_; 3825 my ($self) = @_;
2872 3826
2873 ($self->{w}, $self->{h}) 3827 ($self->{w}, $self->{h})
2874} 3828}
2875 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
2876sub size_allocate { 3844sub invoke_size_allocate {
2877 my ($self, $w, $h) = @_; 3845 my ($self, $w, $h) = @_;
2878
2879 my $old_w = $self->{old_w}; $self->{old_w} = $w;
2880 my $old_h = $self->{old_h}; $self->{old_h} = $h;
2881
2882 CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
2883 if $old_w && $old_h && ($old_w != $w || $old_h != $h);
2884 3846
2885 for my $child ($self->children) { 3847 for my $child ($self->children) {
2886 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)};
2887 3849
2888 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3850 $X = $child->{force_x} if exists $child->{force_x};
2889 if exists $child->{req_x}; 3851 $Y = $child->{force_y} if exists $child->{force_y};
2890 3852
2891 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3853 $X = _to_pixel $X, $W, $self->{w};
2892 if exists $child->{req_y}; 3854 $Y = _to_pixel $Y, $H, $self->{h};
2893
2894 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
2895 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
2896 3855
2897 $child->configure ($X, $Y, $W, $H); 3856 $child->configure ($X, $Y, $W, $H);
2898 } 3857 }
3858
3859 1
2899} 3860}
2900 3861
2901sub coord2local { 3862sub coord2local {
2902 my ($self, $x, $y) = @_; 3863 my ($self, $x, $y) = @_;
2903 3864
… …
2911} 3872}
2912 3873
2913sub update { 3874sub update {
2914 my ($self) = @_; 3875 my ($self) = @_;
2915 3876
2916 $self->check_size;
2917 $::WANT_REFRESH++; 3877 $::WANT_REFRESH++;
2918} 3878}
2919 3879
2920sub add { 3880sub add {
2921 my ($self, @children) = @_; 3881 my ($self, @children) = @_;
2922 3882
2923 for my $child (@children) {
2924 $child->{toplevel} = 1; 3883 $_->{is_toplevel} = 1
2925 3884 for @children;
2926 # integerise window positions
2927 $child->{x} = int $child->{x};
2928 $child->{y} = int $child->{y};
2929 }
2930 3885
2931 $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 }
2932} 3902}
2933 3903
2934sub on_refresh { 3904sub on_refresh {
2935 my ($self, $id, $cb) = @_; 3905 my ($self, $id, $cb) = @_;
2936 3906
… …
2949 while ($self->{refresh_hook}) { 3919 while ($self->{refresh_hook}) {
2950 $_->() 3920 $_->()
2951 for values %{delete $self->{refresh_hook}}; 3921 for values %{delete $self->{refresh_hook}};
2952 } 3922 }
2953 3923
2954 if ($self->{check_size}) { 3924 if ($self->{realloc}) {
2955 my @queue = ([], []); 3925 my %queue;
3926 my @queue;
3927 my $widget;
2956 3928
2957 for (;;) { 3929 outer:
2958 if ($self->{check_size}) { 3930 while () {
2959 # heuristic: check containers last 3931 if (my $realloc = delete $self->{realloc}) {
2960 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 3932 for $widget (values %$realloc) {
2961 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 }
2962 } 3939 }
2963 3940
2964 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 3941 while () {
3942 @queue or last outer;
2965 3943
2966 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 3944 $widget = pop @{ $queue[-1] || [] }
2967 ? @$widget{qw(user_w user_h)} 3945 and last;
2968 : $widget->size_request;
2969
2970 if (delete $widget->{force_alloc}
2971 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
2972 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
2973 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}) {
2974 $widget->{req_w} = $w; 3965 $widget->{req_w} = $w;
2975 $widget->{req_h} = $h; 3966 $widget->{req_h} = $h;
2976 3967
2977 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3968 $self->{size_alloc}{$widget+0} = $widget;
2978 3969
2979 $widget->{parent}->check_size
2980 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 }
2981 } 3977 }
3978
3979 delete $self->{realloc}{$widget+0};
2982 } 3980 }
2983 } 3981 }
2984 3982
2985 while ($self->{size_alloc}) { 3983 while (my $size_alloc = delete $self->{size_alloc}) {
2986 for (values %{delete $self->{size_alloc}}) { 3984 my @queue = sort { $b->{visible} <=> $a->{visible} }
2987 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)};
2988 3991
2989 $w = 0 if $w < 0; 3992 $w = 0 if $w < 0;
2990 $h = 0 if $h < 0; 3993 $h = 0 if $h < 0;
2991 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
2992 $widget->{w} = $w; 4002 $widget->{w} = $w;
2993 $widget->{h} = $h; 4003 $widget->{h} = $h;
2994 $widget->size_allocate ($w, $h); 4004
2995 $widget->emit (size_allocate => $w, $h); 4005 $widget->emit (size_allocate => $w, $h);
4006 }
2996 } 4007 }
2997 } 4008 }
2998 4009
2999 while ($self->{post_alloc_hook}) { 4010 while ($self->{post_alloc_hook}) {
3000 $_->() 4011 $_->()
3001 for values %{delete $self->{post_alloc_hook}}; 4012 for values %{delete $self->{post_alloc_hook}};
3002 } 4013 }
3003 4014
4015
3004 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4016 glViewport 0, 0, $::WIDTH, $::HEIGHT;
3005 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4017 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3006 glClear GL_COLOR_BUFFER_BIT; 4018 glClear GL_COLOR_BUFFER_BIT;
3007 4019
3008 glMatrixMode GL_PROJECTION; 4020 glMatrixMode GL_PROJECTION;
3009 glLoadIdentity; 4021 glLoadIdentity;
3010 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4022 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3011 glMatrixMode GL_MODELVIEW; 4023 glMatrixMode GL_MODELVIEW;
3012 glLoadIdentity; 4024 glLoadIdentity;
3013 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
3014 $self->_draw; 4033 $self->_draw;
3015} 4034}
3016 4035
3017############################################################################# 4036#############################################################################
3018 4037
3019package CFClient::UI; 4038package CFClient::UI;
3020 4039
3021$ROOT = new CFClient::UI::Root; 4040$ROOT = new CFClient::UI::Root;
3022$TOOLTIP = new CFClient::UI::Tooltip; 4041$TOOLTIP = new CFClient::UI::Tooltip z => 900;
3023 4042
30241 40431
3025 4044

Diff Legend

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