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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.325 by root, Thu Jul 13 01:29:17 2006 UTC

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

Diff Legend

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