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

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

Diff Legend

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