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.179 by elmex, Fri Apr 28 05:17:21 2006 UTC vs.
Revision 1.350 by root, Sat Aug 19 18:39:24 2006 UTC

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

Diff Legend

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