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.345 by root, Sun Aug 13 21:46:10 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
1137my $bg =
1138 new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1139 mipmap => 1, wrap => 1;
1140
1141my @border =
1142 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1143 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1144
1145sub new {
1146 my ($class, %arg) = @_;
789 1147
790 my $self = $class->SUPER::new ( 1148 my $self = $class->SUPER::new (
791 bg => [1, 1, 1, 1], 1149 bg => [1, 1, 1, 1],
792 border_bg => [1, 1, 1, 1], 1150 border_bg => [1, 1, 1, 1],
793 border => 0.6, 1151 border => 0.6,
794 can_events => 1, 1152 can_events => 1,
795 @_ 1153 min_w => 64,
1154 min_h => 32,
1155 %arg,
796 ); 1156 );
797 1157
798 $self->{title} &&= new CFClient::UI::Label 1158 $self->{title_widget} = new CFPlus::UI::Label
799 align => 0, 1159 align => 0,
800 valign => 1, 1160 valign => 1,
801 text => $self->{title}, 1161 text => $self->{title},
802 fontsize => $self->{border}; 1162 fontsize => $self->{border},
1163 if exists $self->{title};
1164
1165 if ($self->{has_close_button}) {
1166 $self->{close_button} =
1167 new CFPlus::UI::ImageButton
1168 path => 'x1_close.png',
1169 on_activate => sub { $self->emit ("delete") };
1170
1171 $self->CFPlus::UI::Container::add ($self->{close_button});
1172 }
803 1173
804 $self 1174 $self
1175}
1176
1177sub add {
1178 my ($self, @widgets) = @_;
1179
1180 $self->SUPER::add (@widgets);
1181 $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1182 $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
805} 1183}
806 1184
807sub border { 1185sub border {
808 int $_[0]{border} * $::FONTSIZE 1186 int $_[0]{border} * $::FONTSIZE
809} 1187}
810 1188
811sub size_request { 1189sub size_request {
812 my ($self) = @_; 1190 my ($self) = @_;
1191
1192 $self->{title_widget}->size_request
1193 if $self->{title_widget};
1194
1195 $self->{close_button}->size_request
1196 if $self->{close_button};
813 1197
814 my ($w, $h) = $self->SUPER::size_request; 1198 my ($w, $h) = $self->SUPER::size_request;
815 1199
816 ( 1200 (
817 $w + $self->border * 2, 1201 $w + $self->border * 2,
818 $h + $self->border * 2, 1202 $h + $self->border * 2,
819 ) 1203 )
820} 1204}
821 1205
822sub size_allocate { 1206sub invoke_size_allocate {
823 my ($self, $w, $h) = @_; 1207 my ($self, $w, $h) = @_;
824 1208
1209 if ($self->{title_widget}) {
1210 $self->{title_widget}{w} = $w;
1211 $self->{title_widget}{h} = $h;
1212 $self->{title_widget}->invoke_size_allocate ($w, $h);
1213 }
1214
1215 my $border = $self->border;
1216
825 $h -= List::Util::max 0, $self->border * 2; 1217 $h -= List::Util::max 0, $border * 2;
826 $w -= List::Util::max 0, $self->border * 2; 1218 $w -= List::Util::max 0, $border * 2;
827 1219
828 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
829 if $self->{title};
830
831 $self->child->configure ($self->border, $self->border, $w, $h); 1220 $self->child->configure ($border, $border, $w, $h);
832}
833 1221
1222 $self->{close_button}->configure ($self->{w} - $border, 0, $border, $border)
1223 if $self->{close_button};
1224
1225 1
1226}
1227
1228sub invoke_delete {
1229 my ($self) = @_;
1230
1231 $self->hide;
1232
1233 1
1234}
1235
834sub button_down { 1236sub invoke_button_down {
835 my ($self, $ev, $x, $y) = @_; 1237 my ($self, $ev, $x, $y) = @_;
836 1238
837 my ($w, $h) = @$self{qw(w h)}; 1239 my ($w, $h) = @$self{qw(w h)};
838 my $border = $self->border; 1240 my $border = $self->border;
839 1241
… …
852 my ($ev, $x, $y) = @_; 1254 my ($ev, $x, $y) = @_;
853 1255
854 my $dx = $ev->{x} - $ox; 1256 my $dx = $ev->{x} - $ox;
855 my $dy = $ev->{y} - $oy; 1257 my $dy = $ev->{y} - $oy;
856 1258
857 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1259 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
858 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1260 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1261
859 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1262 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
860 $self->check_size; 1263 $self->realloc;
861 }; 1264 };
862 1265
863 } elsif ($lr ^ $td) { 1266 } elsif ($lr ^ $td) {
864 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1267 my ($ox, $oy) = ($ev->{x}, $ev->{y});
865 my ($bx, $by) = ($self->{x}, $self->{y}); 1268 my ($bx, $by) = ($self->{x}, $self->{y});
… …
867 $self->{motion} = sub { 1270 $self->{motion} = sub {
868 my ($ev, $x, $y) = @_; 1271 my ($ev, $x, $y) = @_;
869 1272
870 ($x, $y) = ($ev->{x}, $ev->{y}); 1273 ($x, $y) = ($ev->{x}, $ev->{y});
871 1274
872 $self->move ($bx + $x - $ox, $by + $y - $oy); 1275 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
873 $self->update; 1276 # HACK: the next line is required to enforce placement
1277 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
874 }; 1278 };
1279 } else {
1280 return 0;
1281 }
1282
875 } 1283 1
876} 1284}
877 1285
878sub button_up { 1286sub invoke_button_up {
879 my ($self, $ev, $x, $y) = @_; 1287 my ($self, $ev, $x, $y) = @_;
880 1288
881 delete $self->{motion}; 1289 ! ! delete $self->{motion}
882} 1290}
883 1291
884sub mouse_motion { 1292sub invoke_mouse_motion {
885 my ($self, $ev, $x, $y) = @_; 1293 my ($self, $ev, $x, $y) = @_;
886 1294
887 $self->{motion}->($ev, $x, $y) if $self->{motion}; 1295 $self->{motion}->($ev, $x, $y) if $self->{motion};
1296
1297 ! ! $self->{motion}
1298}
1299
1300sub invoke_visibility_change {
1301 my ($self, $visible) = @_;
1302
1303 delete $self->{motion} unless $visible;
1304
1305 0
888} 1306}
889 1307
890sub _draw { 1308sub _draw {
891 my ($self) = @_; 1309 my ($self) = @_;
892 1310
1311 my $child = $self->{children}[0];
1312
893 my ($w, $h ) = ($self->{w}, $self->{h}); 1313 my ($w, $h ) = ($self->{w}, $self->{h});
894 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1314 my ($cw, $ch) = ($child->{w}, $child->{h});
895 1315
896 glEnable GL_BLEND;
897 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
898 glEnable GL_TEXTURE_2D; 1316 glEnable GL_TEXTURE_2D;
899 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1317 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
900 1318
901 my $border = $self->border; 1319 my $border = $self->border;
902 1320
903 glColor @{ $self->{border_bg} }; 1321 glColor @{ $self->{border_bg} };
904 $tex[1]->draw_quad (0, 0, $w, $border); 1322 $border[0]->draw_quad_alpha (0, 0, $w, $border);
905 $tex[3]->draw_quad (0, $border, $border, $ch); 1323 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
906 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1324 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
907 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1325 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
908 1326
909 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1327 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
910 my $bg = $tex[0]; 1328 glColor @{ $self->{bg} };
911 1329
912 # TODO: repeat texture not scale 1330 # TODO: repeat texture not scale
1331 # solve this better(?)
913 my $rep_x = $cw / $bg->{w}; 1332 $bg->{s} = $cw / $bg->{w};
914 my $rep_y = $ch / $bg->{h}; 1333 $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); 1334 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1335 }
922 1336
923 glDisable GL_TEXTURE_2D; 1337 glDisable GL_TEXTURE_2D;
924 glDisable GL_BLEND;
925 }
926 1338
927 $self->{title}->draw if $self->{title};
928
929 $self->child->draw; 1339 $child->draw;
1340
1341 if ($self->{title_widget}) {
1342 glTranslate 0, $border - $self->{h};
1343 $self->{title_widget}->_draw;
1344
1345 glTranslate 0, - ($border - $self->{h});
1346 }
1347
1348 $self->{close_button}->draw
1349 if $self->{close_button};
930} 1350}
931 1351
932############################################################################# 1352#############################################################################
933 1353
934package CFClient::UI::Table; 1354package CFPlus::UI::Table;
935 1355
936our @ISA = CFClient::UI::Base::; 1356our @ISA = CFPlus::UI::Base::;
937 1357
938use List::Util qw(max sum); 1358use List::Util qw(max sum);
939 1359
940use CFClient::OpenGL; 1360use CFPlus::OpenGL;
941 1361
942sub new { 1362sub new {
943 my $class = shift; 1363 my $class = shift;
944 1364
945 $class->SUPER::new ( 1365 $class->SUPER::new (
946 col_expand => [], 1366 col_expand => [],
947 @_ 1367 @_,
948 ) 1368 )
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} 1369}
959 1370
960sub children { 1371sub children {
961 grep $_, map @$_, grep $_, @{ $_[0]{children} } 1372 grep $_, map @$_, grep $_, @{ $_[0]{children} }
962} 1373}
963 1374
1375sub add {
1376 my ($self) = shift;
1377
1378 while (@_) {
1379 my ($x, $y, $child) = splice @_, 0, 3, ();
1380 $child->set_parent ($self);
1381 $self->{children}[$y][$x] = $child;
1382 }
1383
1384 $self->{force_realloc} = 1;
1385 $self->{force_size_alloc} = 1;
1386 $self->realloc;
1387}
1388
1389sub remove {
1390 my ($self, $child) = @_;
1391
1392 # TODO: not yet implemented
1393}
1394
964# TODO: move to container class maybe? send childs a signal on removal? 1395# TODO: move to container class maybe? send children a signal on removal?
965sub clear { 1396sub clear {
966 my ($self) = @_; 1397 my ($self) = @_;
967 1398
968 my @children = $self->children; 1399 my @children = $self->children;
969 delete $self->{children}; 1400 delete $self->{children};
… …
971 for (@children) { 1402 for (@children) {
972 delete $_->{parent}; 1403 delete $_->{parent};
973 $_->hide; 1404 $_->hide;
974 } 1405 }
975 1406
976 $self->update; 1407 $self->realloc;
977} 1408}
978 1409
979sub get_wh { 1410sub get_wh {
980 my ($self) = @_; 1411 my ($self) = @_;
981 1412
… …
1007 (sum @$ws), 1438 (sum @$ws),
1008 (sum @$hs), 1439 (sum @$hs),
1009 ) 1440 )
1010} 1441}
1011 1442
1012sub size_allocate { 1443sub invoke_size_allocate {
1013 my ($self, $w, $h) = @_; 1444 my ($self, $w, $h) = @_;
1014 1445
1015 my ($ws, $hs) = $self->get_wh; 1446 my ($ws, $hs) = $self->get_wh;
1016 1447
1017 my $req_w = sum @$ws; 1448 my $req_w = (sum @$ws) || 1;
1018 my $req_h = sum @$hs; 1449 my $req_h = (sum @$hs) || 1;
1019 1450
1020 # TODO: nicer code && do row_expand 1451 # TODO: nicer code && do row_expand
1021 my @col_expand = @{$self->{col_expand}}; 1452 my @col_expand = @{$self->{col_expand}};
1022 @col_expand = (1) x @$ws unless @col_expand; 1453 @col_expand = (1) x @$ws unless @col_expand;
1023 my $col_expand = (sum @col_expand) || 1; 1454 my $col_expand = (sum @col_expand) || 1;
1024 1455
1025 # linearly scale sizes 1456 # linearly scale sizes
1026 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1457 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1027 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs; 1458 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1028 1459
1029 CFClient::UI::harmonize $ws; 1460 CFPlus::UI::harmonize $ws;
1030 CFClient::UI::harmonize $hs; 1461 CFPlus::UI::harmonize $hs;
1031 1462
1032 my $y; 1463 my $y;
1033 1464
1034 for my $r (0 .. $#{$self->{children}}) { 1465 for my $r (0 .. $#{$self->{children}}) {
1035 my $row = $self->{children}[$r] 1466 my $row = $self->{children}[$r]
… …
1049 } 1480 }
1050 1481
1051 $y += $row_h; 1482 $y += $row_h;
1052 } 1483 }
1053 1484
1485 1
1054} 1486}
1055 1487
1056sub find_widget { 1488sub find_widget {
1057 my ($self, $x, $y) = @_; 1489 my ($self, $x, $y) = @_;
1058 1490
… …
1077 } 1509 }
1078} 1510}
1079 1511
1080############################################################################# 1512#############################################################################
1081 1513
1082package CFClient::UI::HBox; 1514package CFPlus::UI::Box;
1083 1515
1084# TODO: wrap into common Box base class
1085
1086our @ISA = CFClient::UI::Container::; 1516our @ISA = CFPlus::UI::Container::;
1087 1517
1088sub size_request { 1518sub size_request {
1089 my ($self) = @_; 1519 my ($self) = @_;
1090 1520
1091 my @alloc = map [$_->size_request], @{$self->{children}}; 1521 $self->{vertical}
1522 ? (
1523 (List::Util::max map $_->{req_w}, @{$self->{children}}),
1524 (List::Util::sum map $_->{req_h}, @{$self->{children}}),
1525 )
1526 : (
1527 (List::Util::sum map $_->{req_w}, @{$self->{children}}),
1528 (List::Util::max map $_->{req_h}, @{$self->{children}}),
1529 )
1530}
1092 1531
1532sub invoke_size_allocate {
1533 my ($self, $w, $h) = @_;
1534
1535 my $space = $self->{vertical} ? $h : $w;
1536 my @children = $self->visible_children;
1537
1538 my @req;
1539
1540 if ($self->{homogeneous}) {
1541 @req = ($space / (@children || 1)) x @children;
1542 } else {
1543 @req = map $_->{$self->{vertical} ? "req_h" : "req_w"}, @children;
1544 my $req = List::Util::sum @req;
1545
1546 if ($req > $space) {
1547 # ah well, not enough space
1548 $_ *= $space / $req for @req;
1549 } else {
1550 my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1551
1552 $space = ($space - $req) / $expand; # remaining space to give away
1553
1554 $req[$_] += $space * $children[$_]{expand}
1555 for 0 .. $#children;
1556 }
1093 ( 1557 }
1094 (List::Util::sum map $_->[0], @alloc), 1558
1095 (List::Util::max map $_->[1], @alloc), 1559 CFPlus::UI::harmonize \@req;
1560
1561 my $pos = 0;
1562 for (0 .. $#children) {
1563 my $alloc = $req[$_];
1564 $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
1565
1566 $pos += $alloc;
1567 }
1568
1569 1
1570}
1571
1572#############################################################################
1573
1574package CFPlus::UI::HBox;
1575
1576our @ISA = CFPlus::UI::Box::;
1577
1578sub new {
1579 my $class = shift;
1580
1581 $class->SUPER::new (
1582 vertical => 0,
1583 @_,
1096 ) 1584 )
1097} 1585}
1098 1586
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############################################################################# 1587#############################################################################
1141 1588
1142package CFClient::UI::VBox; 1589package CFPlus::UI::VBox;
1143 1590
1144# TODO: wrap into common Box base class 1591our @ISA = CFPlus::UI::Box::;
1145 1592
1146our @ISA = CFClient::UI::Container::; 1593sub new {
1594 my $class = shift;
1147 1595
1148sub size_request { 1596 $class->SUPER::new (
1149 my ($self) = @_; 1597 vertical => 1,
1150 1598 @_,
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 ) 1599 )
1157} 1600}
1158 1601
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############################################################################# 1602#############################################################################
1197 1603
1198package CFClient::UI::Label; 1604package CFPlus::UI::Label;
1199 1605
1200our @ISA = CFClient::UI::Base::; 1606our @ISA = CFPlus::UI::DrawBG::;
1201 1607
1202use CFClient::OpenGL; 1608use CFPlus::OpenGL;
1203 1609
1204sub new { 1610sub new {
1205 my ($class, %arg) = @_; 1611 my ($class, %arg) = @_;
1206 1612
1207 my $self = $class->SUPER::new ( 1613 my $self = $class->SUPER::new (
1208 fg => [1, 1, 1], 1614 fg => [1, 1, 1],
1615 #bg => none
1616 #active_bg => none
1209 #font => default_font 1617 #font => default_font
1618 #text => initial text
1619 #markup => initial narkup
1620 #max_w => maximum pixel width
1621 #style => 0, # render flags
1622 ellipsise => 3, # end
1623 layout => (new CFPlus::Layout),
1210 fontsize => 1, 1624 fontsize => 1,
1211 text => "",
1212 align => -1, 1625 align => -1,
1213 valign => -1, 1626 valign => -1,
1214 padding => 2, 1627 padding_x => 2,
1215 layout => new CFClient::Layout, 1628 padding_y => 2,
1216 can_events => 0, 1629 can_events => 0,
1217 %arg 1630 %arg
1218 ); 1631 );
1219 1632
1220 if (exists $self->{template}) { 1633 if (exists $self->{template}) {
1221 my $layout = new CFClient::Layout; 1634 my $layout = new CFPlus::Layout;
1222 $layout->set_text (delete $self->{template}); 1635 $layout->set_text (delete $self->{template});
1223 $self->{template} = $layout; 1636 $self->{template} = $layout;
1224 } 1637 }
1225 1638
1226 $self->set_text (delete $self->{text}) if exists $self->{text}; 1639 if (exists $self->{markup}) {
1227 $self->set_markup (delete $self->{markup}) if exists $self->{markup}; 1640 $self->set_markup (delete $self->{markup});
1641 } else {
1642 $self->set_text (delete $self->{text});
1643 }
1228 1644
1229 $self 1645 $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} 1646}
1241 1647
1242sub update { 1648sub update {
1243 my ($self) = @_; 1649 my ($self) = @_;
1244 1650
1245 delete $self->{texture}; 1651 delete $self->{texture};
1246 $self->SUPER::update; 1652 $self->SUPER::update;
1247} 1653}
1248 1654
1249sub reconfigure { 1655sub realloc {
1250 my ($self) = @_; 1656 my ($self) = @_;
1251 1657
1252 delete $self->{texture}; 1658 delete $self->{ox};
1659 $self->SUPER::realloc;
1253} 1660}
1254 1661
1255sub set_text { 1662sub set_text {
1256 my ($self, $text) = @_; 1663 my ($self, $text) = @_;
1257 1664
1258 return if $self->{text} eq "T$text"; 1665 return if $self->{text} eq "T$text";
1259 $self->{text} = "T$text"; 1666 $self->{text} = "T$text";
1260 1667
1261 $self->{layout}->set_text ($text); 1668 $self->{layout}->set_text ($text);
1262 1669
1263 delete $self->{texture}; 1670 delete $self->{size_req};
1671 $self->realloc;
1264 $self->update; 1672 $self->update;
1265 $self->check_size;
1266} 1673}
1267 1674
1268sub set_markup { 1675sub set_markup {
1269 my ($self, $markup) = @_; 1676 my ($self, $markup) = @_;
1270 1677
1271 return if $self->{text} eq "M$markup"; 1678 return if $self->{text} eq "M$markup";
1272 $self->{text} = "M$markup"; 1679 $self->{text} = "M$markup";
1273 1680
1681 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1682
1274 $self->{layout}->set_markup ($markup); 1683 $self->{layout}->set_markup ($markup);
1275 1684
1276 delete $self->{texture}; 1685 delete $self->{size_req};
1686 $self->realloc;
1277 $self->update; 1687 $self->update;
1278 $self->check_size;
1279} 1688}
1280 1689
1281sub size_request { 1690sub size_request {
1282 my ($self) = @_; 1691 my ($self) = @_;
1283 1692
1693 $self->{size_req} ||= do {
1284 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1694 $self->{layout}->set_font ($self->{font}) if $self->{font};
1285 $self->{layout}->set_width ($self->{max_w} || -1); 1695 $self->{layout}->set_width ($self->{max_w} || -1);
1696 $self->{layout}->set_ellipsise ($self->{ellipsise});
1697 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1286 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1698 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1287 1699
1288 my ($w, $h) = $self->{layout}->size; 1700 my ($w, $h) = $self->{layout}->size;
1289 1701
1290 if (exists $self->{template}) { 1702 if (exists $self->{template}) {
1291 $self->{template}->set_font ($self->{font}) if $self->{font}; 1703 $self->{template}->set_font ($self->{font}) if $self->{font};
1704 $self->{template}->set_width ($self->{max_w} || -1);
1292 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1705 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1293 1706
1294 my ($w2, $h2) = $self->{template}->size; 1707 my ($w2, $h2) = $self->{template}->size;
1295 1708
1296 $w = List::Util::max $w, $w2; 1709 $w = List::Util::max $w, $w2;
1297 $h = List::Util::max $h, $h2; 1710 $h = List::Util::max $h, $h2;
1711 }
1712
1713 [$w, $h]
1298 } 1714 };
1299 1715
1300 ( 1716 @{ $self->{size_req} }
1301 $w + $self->{padding} * 2,
1302 $h + $self->{padding} * 2,
1303 )
1304} 1717}
1305 1718
1719sub baseline_shift {
1720 $_[0]{layout}->descent
1721}
1722
1306sub size_allocate { 1723sub invoke_size_allocate {
1307 my ($self, $w, $h) = @_; 1724 my ($self, $w, $h) = @_;
1308 1725
1726 delete $self->{ox};
1727
1309 delete $self->{texture}; 1728 delete $self->{texture}
1729 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
1730
1731 1
1310} 1732}
1311 1733
1312sub set_fontsize { 1734sub set_fontsize {
1313 my ($self, $fontsize) = @_; 1735 my ($self, $fontsize) = @_;
1314 1736
1315 $self->{fontsize} = $fontsize; 1737 $self->{fontsize} = $fontsize;
1738 delete $self->{size_req};
1316 delete $self->{texture}; 1739 delete $self->{texture};
1317 $self->check_size; 1740
1318 $self->update; 1741 $self->realloc;
1742}
1743
1744sub reconfigure {
1745 my ($self) = @_;
1746
1747 delete $self->{size_req};
1748 delete $self->{texture};
1749
1750 $self->SUPER::reconfigure;
1319} 1751}
1320 1752
1321sub _draw { 1753sub _draw {
1322 my ($self) = @_; 1754 my ($self) = @_;
1323 1755
1756 $self->SUPER::_draw; # draw background, if applicable
1757
1324 my $tex = $self->{texture} ||= do { 1758 my $size = $self->{texture} ||= do {
1759 $self->{layout}->set_foreground (@{$self->{fg}});
1325 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1760 $self->{layout}->set_font ($self->{font}) if $self->{font};
1326 $self->{layout}->set_width ($self->{w}); 1761 $self->{layout}->set_width ($self->{w});
1762 $self->{layout}->set_ellipsise ($self->{ellipsise});
1763 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1327 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 1764 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1328 new_from_layout CFClient::Texture $self->{layout} 1765
1766 [$self->{layout}->size]
1329 }; 1767 };
1330 1768
1331 glEnable GL_BLEND; 1769 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} 1770 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1340 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 1771 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1341 : ($self->{w} - $tex->{w}) * 0.5 1772 : ($self->{w} - $size->[0]) * 0.5);
1342 );
1343 1773
1344 $self->{oy} = int (
1345 $self->{valign} < 0 ? $self->{padding} 1774 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1346 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 1775 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1347 : ($self->{h} - $tex->{h}) * 0.5 1776 : ($self->{h} - $size->[1]) * 0.5);
1348 ); 1777 };
1349 1778
1350 $tex->draw_quad ($self->{ox}, $self->{oy}); 1779 my $w = List::Util::min $self->{w} + 4, $size->[0];
1780 my $h = List::Util::min $self->{h} + 2, $size->[1];
1351 1781
1352 glDisable GL_TEXTURE_2D; 1782 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1353 glDisable GL_BLEND;
1354} 1783}
1355 1784
1356############################################################################# 1785#############################################################################
1357 1786
1358package CFClient::UI::EntryBase; 1787package CFPlus::UI::EntryBase;
1359 1788
1360our @ISA = CFClient::UI::Label::; 1789our @ISA = CFPlus::UI::Label::;
1361 1790
1362use CFClient::OpenGL; 1791use CFPlus::OpenGL;
1363 1792
1364sub new { 1793sub new {
1365 my $class = shift; 1794 my $class = shift;
1366 1795
1367 $class->SUPER::new ( 1796 $class->SUPER::new (
… …
1371 active_fg => [0, 0, 0], 1800 active_fg => [0, 0, 0],
1372 can_hover => 1, 1801 can_hover => 1,
1373 can_focus => 1, 1802 can_focus => 1,
1374 valign => 0, 1803 valign => 0,
1375 can_events => 1, 1804 can_events => 1,
1805 #text => ...
1806 #hidden => "*",
1376 @_ 1807 @_
1377 ) 1808 )
1378} 1809}
1379 1810
1380sub _set_text { 1811sub _set_text {
… …
1382 1813
1383 delete $self->{cur_h}; 1814 delete $self->{cur_h};
1384 1815
1385 return if $self->{text} eq $text; 1816 return if $self->{text} eq $text;
1386 1817
1387 delete $self->{texture};
1388
1389 $self->{last_activity} = $::NOW; 1818 $self->{last_activity} = $::NOW;
1390 $self->{text} = $text; 1819 $self->{text} = $text;
1391 1820
1392 $text =~ s/./*/g if $self->{hidden}; 1821 $text =~ s/./*/g if $self->{hidden};
1393 $self->{layout}->set_text ("$text "); 1822 $self->{layout}->set_text ("$text ");
1823 delete $self->{size_req};
1394 1824
1395 $self->emit (changed => $self->{text}); 1825 $self->emit (changed => $self->{text});
1826
1827 $self->realloc;
1828 $self->update;
1829}
1830
1831sub set_text {
1832 my ($self, $text) = @_;
1833
1834 $self->{cursor} = length $text;
1835 $self->_set_text ($text);
1396} 1836}
1397 1837
1398sub get_text { 1838sub get_text {
1399 $_[0]{text} 1839 $_[0]{text}
1400} 1840}
… …
1405 my ($w, $h) = $self->SUPER::size_request; 1845 my ($w, $h) = $self->SUPER::size_request;
1406 1846
1407 ($w + 1, $h) # add 1 for cursor 1847 ($w + 1, $h) # add 1 for cursor
1408} 1848}
1409 1849
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 { 1850sub invoke_key_down {
1425 my ($self, $ev) = @_; 1851 my ($self, $ev) = @_;
1426 1852
1427 my $mod = $ev->{mod}; 1853 my $mod = $ev->{mod};
1428 my $sym = $ev->{sym}; 1854 my $sym = $ev->{sym};
1429 my $uni = $ev->{unicode}; 1855 my $uni = $ev->{unicode};
1430 1856
1431 my $text = $self->get_text; 1857 my $text = $self->get_text;
1432 1858
1433 if ($sym == 8) { 1859 if ($uni == 8) {
1434 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 1860 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1435 } elsif ($sym == 127) { 1861 } elsif ($uni == 127) {
1436 substr $text, $self->{cursor}, 1, ""; 1862 substr $text, $self->{cursor}, 1, "";
1437 } elsif ($sym == CFClient::SDLK_LEFT) { 1863 } elsif ($sym == CFPlus::SDLK_LEFT) {
1438 --$self->{cursor} if $self->{cursor}; 1864 --$self->{cursor} if $self->{cursor};
1439 } elsif ($sym == CFClient::SDLK_RIGHT) { 1865 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1440 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 1866 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1441 } elsif ($sym == CFClient::SDLK_HOME) { 1867 } elsif ($sym == CFPlus::SDLK_HOME) {
1442 $self->{cursor} = 0; 1868 $self->{cursor} = 0;
1443 } elsif ($sym == CFClient::SDLK_END) { 1869 } elsif ($sym == CFPlus::SDLK_END) {
1444 $self->{cursor} = length $text; 1870 $self->{cursor} = length $text;
1445 } elsif ($sym == 27) { 1871 } elsif ($uni == 27) {
1446 $self->emit ('escape'); 1872 $self->emit ('escape');
1447 } elsif ($uni) { 1873 } elsif ($uni) {
1448 substr $text, $self->{cursor}++, 0, chr $uni; 1874 substr $text, $self->{cursor}++, 0, chr $uni;
1875 } else {
1876 return 0;
1449 } 1877 }
1450 1878
1451 $self->_set_text ($text); 1879 $self->_set_text ($text);
1452 $self->update;
1453}
1454 1880
1881 $self->realloc;
1882
1883 1
1884}
1885
1455sub focus_in { 1886sub invoke_focus_in {
1456 my ($self) = @_; 1887 my ($self) = @_;
1457 1888
1458 $self->{last_activity} = $::NOW; 1889 $self->{last_activity} = $::NOW;
1459 1890
1460 $self->SUPER::focus_in; 1891 $self->SUPER::invoke_focus_in
1461} 1892}
1462 1893
1463sub button_down { 1894sub invoke_button_down {
1464 my ($self, $ev, $x, $y) = @_; 1895 my ($self, $ev, $x, $y) = @_;
1465 1896
1466 $self->SUPER::button_down ($ev, $x, $y); 1897 $self->SUPER::invoke_button_down ($ev, $x, $y);
1467 1898
1468 my $idx = $self->{layout}->xy_to_index ($x, $y); 1899 my $idx = $self->{layout}->xy_to_index ($x, $y);
1469 1900
1470 # byte-index to char-index 1901 # byte-index to char-index
1471 my $text = $self->{text}; 1902 my $text = $self->{text};
1472 utf8::encode $text; 1903 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1473 $self->{cursor} = length substr $text, 0, $idx; 1904 $self->{cursor} = length $text;
1474 1905
1475 $self->_set_text ($self->{text}); 1906 $self->_set_text ($self->{text});
1476 $self->update; 1907 $self->update;
1908
1909 1
1477} 1910}
1478 1911
1479sub mouse_motion { 1912sub invoke_mouse_motion {
1480 my ($self, $ev, $x, $y) = @_; 1913 my ($self, $ev, $x, $y) = @_;
1481# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d# 1914# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1915
1916 1
1482} 1917}
1483 1918
1484sub _draw { 1919sub _draw {
1485 my ($self) = @_; 1920 my ($self) = @_;
1486 1921
1487 local $self->{fg} = $self->{fg}; 1922 local $self->{fg} = $self->{fg};
1488 1923
1489 if ($FOCUS == $self) { 1924 if ($FOCUS == $self) {
1490 glColor @{$self->{active_bg}}; 1925 glColor_premultiply @{$self->{active_bg}};
1491 $self->{fg} = $self->{active_fg}; 1926 $self->{fg} = $self->{active_fg};
1492 } else { 1927 } else {
1493 glColor @{$self->{bg}}; 1928 glColor_premultiply @{$self->{bg}};
1494 } 1929 }
1495 1930
1496 glEnable GL_BLEND; 1931 glEnable GL_BLEND;
1497 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1932 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1498 glBegin GL_QUADS; 1933 glBegin GL_QUADS;
1499 glVertex 0 , 0; 1934 glVertex 0 , 0;
1500 glVertex 0 , $self->{h}; 1935 glVertex 0 , $self->{h};
1501 glVertex $self->{w}, $self->{h}; 1936 glVertex $self->{w}, $self->{h};
1502 glVertex $self->{w}, 0; 1937 glVertex $self->{w}, 0;
… …
1513 utf8::encode $text; 1948 utf8::encode $text;
1514 1949
1515 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text) 1950 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1516 } 1951 }
1517 1952
1518 glColor @{$self->{fg}};
1519 glBegin GL_LINES; 1953 glBegin GL_LINES;
1520 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 1954 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}; 1955 glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1522 glEnd; 1956 glEnd;
1523 } 1957 }
1524} 1958}
1525 1959
1526package CFClient::UI::Entry; 1960package CFPlus::UI::Entry;
1527 1961
1528our @ISA = CFClient::UI::EntryBase::; 1962our @ISA = CFPlus::UI::EntryBase::;
1529 1963
1530use CFClient::OpenGL; 1964use CFPlus::OpenGL;
1531 1965
1532sub key_down { 1966sub invoke_key_down {
1533 my ($self, $ev) = @_; 1967 my ($self, $ev) = @_;
1534 1968
1535 my $sym = $ev->{sym}; 1969 my $sym = $ev->{sym};
1536 1970
1537 if ($sym == 13) { 1971 if ($sym == 13) {
1538 unshift @{$self->{history}}, 1972 unshift @{$self->{history}},
1539 my $txt = $self->get_text; 1973 my $txt = $self->get_text;
1974
1540 $self->{history_pointer} = -1; 1975 $self->{history_pointer} = -1;
1541 $self->{history_saveback} = ''; 1976 $self->{history_saveback} = '';
1542 $self->emit (activate => $txt); 1977 $self->emit (activate => $txt);
1543 $self->update; 1978 $self->update;
1544 1979
1545 } elsif ($sym == CFClient::SDLK_UP) { 1980 } elsif ($sym == CFPlus::SDLK_UP) {
1546 if ($self->{history_pointer} < 0) { 1981 if ($self->{history_pointer} < 0) {
1547 $self->{history_saveback} = $self->get_text; 1982 $self->{history_saveback} = $self->get_text;
1548 } 1983 }
1549 if (@{$self->{history} || []} > 0) { 1984 if (@{$self->{history} || []} > 0) {
1550 $self->{history_pointer}++; 1985 $self->{history_pointer}++;
… …
1552 $self->{history_pointer} = @{$self->{history} || []} - 1; 1987 $self->{history_pointer} = @{$self->{history} || []} - 1;
1553 } 1988 }
1554 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1989 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1555 } 1990 }
1556 1991
1557 } elsif ($sym == CFClient::SDLK_DOWN) { 1992 } elsif ($sym == CFPlus::SDLK_DOWN) {
1558 $self->{history_pointer}--; 1993 $self->{history_pointer}--;
1559 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 1994 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1560 1995
1561 if ($self->{history_pointer} >= 0) { 1996 if ($self->{history_pointer} >= 0) {
1562 $self->set_text ($self->{history}->[$self->{history_pointer}]); 1997 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1563 } else { 1998 } else {
1564 $self->set_text ($self->{history_saveback}); 1999 $self->set_text ($self->{history_saveback});
1565 } 2000 }
1566 2001
1567 } else { 2002 } else {
1568 $self->SUPER::key_down ($ev); 2003 return $self->SUPER::invoke_key_down ($ev)
2004 }
2005
1569 } 2006 1
1570
1571} 2007}
1572 2008
1573############################################################################# 2009#############################################################################
1574 2010
1575package CFClient::UI::Button; 2011package CFPlus::UI::Button;
1576 2012
1577our @ISA = CFClient::UI::Label::; 2013our @ISA = CFPlus::UI::Label::;
1578 2014
1579use CFClient::OpenGL; 2015use CFPlus::OpenGL;
1580 2016
1581my @tex = 2017my @tex =
1582 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2018 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1583 qw(b1_button_active.png); 2019 qw(b1_button_active.png);
1584 2020
1585sub new { 2021sub new {
1586 my $class = shift; 2022 my $class = shift;
1587 2023
1588 $class->SUPER::new ( 2024 $class->SUPER::new (
1589 padding => 4, 2025 padding_x => 4,
2026 padding_y => 4,
1590 fg => [1, 1, 1], 2027 fg => [1, 1, 1],
1591 bg => [1, 1, 1, 0.2],
1592 active_fg => [0, 0, 1], 2028 active_fg => [0, 0, 1],
1593 can_hover => 1, 2029 can_hover => 1,
1594 align => 0, 2030 align => 0,
1595 valign => 0, 2031 valign => 0,
1596 can_events => 1, 2032 can_events => 1,
1597 @_ 2033 @_
1598 ) 2034 )
1599} 2035}
1600 2036
1601sub button_up { 2037sub invoke_button_up {
1602 my ($self, $ev, $x, $y) = @_; 2038 my ($self, $ev, $x, $y) = @_;
1603 2039
2040 $self->emit ("activate")
1604 if ($x >= 0 && $x < $self->{w} 2041 if $x >= 0 && $x < $self->{w}
1605 && $y >= 0 && $y < $self->{h}) { 2042 && $y >= 0 && $y < $self->{h};
1606 $self->emit ("activate"); 2043
1607 } 2044 1
1608} 2045}
1609 2046
1610sub _draw { 2047sub _draw {
1611 my ($self) = @_; 2048 my ($self) = @_;
1612 2049
1613 local $self->{fg} = $self->{fg}; 2050 local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
1614 2051
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; 2052 glEnable GL_TEXTURE_2D;
1622 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2053 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1623 glColor 0, 0, 0, 1; 2054 glColor 0, 0, 0, 1;
1624 2055
1625 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h}); 2056 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1626 2057
1627 glDisable GL_TEXTURE_2D; 2058 glDisable GL_TEXTURE_2D;
1628 glDisable GL_BLEND;
1629 2059
1630 $self->SUPER::_draw; 2060 $self->SUPER::_draw;
1631} 2061}
1632 2062
1633############################################################################# 2063#############################################################################
1634 2064
1635package CFClient::UI::CheckBox; 2065package CFPlus::UI::CheckBox;
1636 2066
1637our @ISA = CFClient::UI::DrawBG::; 2067our @ISA = CFPlus::UI::DrawBG::;
1638 2068
1639my @tex = 2069my @tex =
1640 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2070 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1641 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2071 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1642 2072
1643use CFClient::OpenGL; 2073use CFPlus::OpenGL;
1644 2074
1645sub new { 2075sub new {
1646 my $class = shift; 2076 my $class = shift;
1647 2077
1648 $class->SUPER::new ( 2078 $class->SUPER::new (
1649 padding => 2, 2079 padding_x => 2,
2080 padding_y => 2,
1650 fg => [1, 1, 1], 2081 fg => [1, 1, 1],
1651 active_fg => [1, 1, 0], 2082 active_fg => [1, 1, 0],
2083 bg => [0, 0, 0, 0.2],
2084 active_bg => [1, 1, 1, 0.5],
1652 state => 0, 2085 state => 0,
1653 can_hover => 1, 2086 can_hover => 1,
1654 @_ 2087 @_
1655 ) 2088 )
1656} 2089}
1657 2090
1658sub size_request { 2091sub size_request {
1659 my ($self) = @_; 2092 my ($self) = @_;
1660 2093
1661 ($self->{padding} * 2 + 6) x 2 2094 (6) x 2
1662} 2095}
1663 2096
2097sub toggle {
2098 my ($self) = @_;
2099
2100 $self->{state} = !$self->{state};
2101 $self->emit (changed => $self->{state});
2102 $self->update;
2103}
2104
1664sub button_down { 2105sub invoke_button_down {
1665 my ($self, $ev, $x, $y) = @_; 2106 my ($self, $ev, $x, $y) = @_;
1666 2107
1667 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2108 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1668 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2109 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1669 $self->{state} = !$self->{state}; 2110 $self->toggle;
1670 $self->emit (changed => $self->{state}); 2111 } else {
2112 return 0
2113 }
2114
1671 } 2115 1
1672} 2116}
1673 2117
1674sub _draw { 2118sub _draw {
1675 my ($self) = @_; 2119 my ($self) = @_;
1676 2120
1677 $self->SUPER::_draw; 2121 $self->SUPER::_draw;
1678 2122
1679 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2123 glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
1680 2124
1681 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2; 2125 my ($w, $h) = @$self{qw(w h)};
2126
2127 my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
1682 2128
1683 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2129 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1684 2130
1685 glEnable GL_BLEND; 2131 my $tex = $self->{state} ? $tex[1] : $tex[0];
2132
1686 glEnable GL_TEXTURE_2D; 2133 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); 2134 $tex->draw_quad_alpha (0, 0, $s, $s);
1692
1693 glDisable GL_TEXTURE_2D; 2135 glDisable GL_TEXTURE_2D;
1694 glDisable GL_BLEND;
1695} 2136}
1696 2137
1697############################################################################# 2138#############################################################################
1698 2139
1699package CFClient::UI::Image; 2140package CFPlus::UI::Image;
1700 2141
1701our @ISA = CFClient::UI::Base::; 2142our @ISA = CFPlus::UI::Base::;
1702 2143
1703use CFClient::OpenGL; 2144use CFPlus::OpenGL;
1704use Carp qw/confess/;
1705 2145
1706our %loaded_images; 2146our %texture_cache;
1707 2147
1708sub new { 2148sub new {
1709 my $class = shift; 2149 my $class = shift;
1710 2150
1711 my $self = $class->SUPER::new (can_events => 0, @_); 2151 my $self = $class->SUPER::new (
2152 can_events => 0,
2153 @_,
2154 );
1712 2155
1713 $self->{image} or confess "Image has 'image' not set. This is a fatal error!"; 2156 $self->{path} || $self->{tex}
2157 or Carp::croak "'path' or 'tex' attributes required";
1714 2158
1715 $loaded_images{$self->{image}} ||= 2159 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1716 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2160 new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
1717 2161
1718 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2162 Scalar::Util::weaken $texture_cache{$self->{path}};
1719 2163
1720 Scalar::Util::weaken $loaded_images{$self->{image}}; 2164 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1721
1722 $self->{aspect} = $tex->{w} / $tex->{h};
1723 2165
1724 $self 2166 $self
1725} 2167}
1726 2168
2169sub STORABLE_freeze {
2170 my ($self, $cloning) = @_;
2171
2172 $self->{path}
2173 or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2174
2175 $self->{path}
2176}
2177
2178sub STORABLE_attach {
2179 my ($self, $cloning, $path) = @_;
2180
2181 $self->new (path => $path)
2182}
2183
1727sub size_request { 2184sub size_request {
1728 my ($self) = @_; 2185 my ($self) = @_;
1729 2186
1730 ($self->{tex}->{w}, $self->{tex}->{h}) 2187 ($self->{tex}{w}, $self->{tex}{h})
1731} 2188}
1732 2189
1733sub _draw { 2190sub _draw {
1734 my ($self) = @_; 2191 my ($self) = @_;
1735 2192
… …
1742 glTranslate 0, -$self->{w}, 0; 2199 glTranslate 0, -$self->{w}, 0;
1743 2200
1744 ($w, $h) = ($h, $w); 2201 ($w, $h) = ($h, $w);
1745 } 2202 }
1746 2203
1747 glEnable GL_BLEND;
1748 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1749 glEnable GL_TEXTURE_2D; 2204 glEnable GL_TEXTURE_2D;
1750 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2205 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1751 2206
1752 $tex->draw_quad (0, 0, $w, $h); 2207 $tex->draw_quad (0, 0, $w, $h);
1753 2208
1754 glDisable GL_BLEND;
1755 glDisable GL_TEXTURE_2D; 2209 glDisable GL_TEXTURE_2D;
1756} 2210}
1757 2211
1758############################################################################# 2212#############################################################################
1759 2213
2214package CFPlus::UI::ImageButton;
2215
2216our @ISA = CFPlus::UI::Image::;
2217
2218use CFPlus::OpenGL;
2219
2220my %textures;
2221
2222sub new {
2223 my $class = shift;
2224
2225 my $self = $class->SUPER::new (
2226 padding_x => 4,
2227 padding_y => 4,
2228 fg => [1, 1, 1],
2229 active_fg => [0, 0, 1],
2230 can_hover => 1,
2231 align => 0,
2232 valign => 0,
2233 can_events => 1,
2234 @_
2235 );
2236}
2237
2238sub invoke_button_up {
2239 my ($self, $ev, $x, $y) = @_;
2240
2241 $self->emit ("activate")
2242 if $x >= 0 && $x < $self->{w}
2243 && $y >= 0 && $y < $self->{h};
2244
2245 1
2246}
2247
2248#############################################################################
2249
1760package CFClient::UI::VGauge; 2250package CFPlus::UI::VGauge;
1761 2251
1762our @ISA = CFClient::UI::Base::; 2252our @ISA = CFPlus::UI::Base::;
1763 2253
1764use List::Util qw(min max); 2254use List::Util qw(min max);
1765 2255
1766use CFClient::OpenGL; 2256use CFPlus::OpenGL;
1767 2257
1768my %tex = ( 2258my %tex = (
1769 food => [ 2259 food => [
1770 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2260 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1771 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2261 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1772 ], 2262 ],
1773 grace => [ 2263 grace => [
1774 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2264 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/ 2265 qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
1776 ], 2266 ],
1777 hp => [ 2267 hp => [
1778 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2268 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1779 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2269 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1780 ], 2270 ],
1781 mana => [ 2271 mana => [
1782 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2272 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/ 2273 qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
1784 ], 2274 ],
1785); 2275);
1786 2276
1787# eg. VGauge->new (gauge => 'food'), default gauge: food 2277# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1847 my $ycut1 = max 0, min 1, $ycut; 2337 my $ycut1 = max 0, min 1, $ycut;
1848 my $ycut2 = max 0, min 1, $ycut - 1; 2338 my $ycut2 = max 0, min 1, $ycut - 1;
1849 2339
1850 my $h1 = $self->{h} * (1 - $ycut1); 2340 my $h1 = $self->{h} * (1 - $ycut1);
1851 my $h2 = $self->{h} * (1 - $ycut2); 2341 my $h2 = $self->{h} * (1 - $ycut2);
2342 my $h3 = $self->{h};
2343
2344 $_ = $_ * (284-4)/288 + 4/288 for ($h1, $h2, $h3);
1852 2345
1853 glEnable GL_BLEND; 2346 glEnable GL_BLEND;
1854 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2347 glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
2348 GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1855 glEnable GL_TEXTURE_2D; 2349 glEnable GL_TEXTURE_2D;
1856 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2350 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1857 2351
1858 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2352 glBindTexture GL_TEXTURE_2D, $t1->{name};
1859 glBegin GL_QUADS; 2353 glBegin GL_QUADS;
… …
1874 2368
1875 if ($t3) { 2369 if ($t3) {
1876 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2370 glBindTexture GL_TEXTURE_2D, $t3->{name};
1877 glBegin GL_QUADS; 2371 glBegin GL_QUADS;
1878 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2372 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1879 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2373 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1880 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2374 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1881 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2375 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1882 glEnd; 2376 glEnd;
1883 } 2377 }
1884 2378
1885 glDisable GL_BLEND; 2379 glDisable GL_BLEND;
1886 glDisable GL_TEXTURE_2D; 2380 glDisable GL_TEXTURE_2D;
1887} 2381}
1888 2382
1889############################################################################# 2383#############################################################################
1890 2384
1891package CFClient::UI::Gauge; 2385package CFPlus::UI::Gauge;
1892 2386
1893our @ISA = CFClient::UI::VBox::; 2387our @ISA = CFPlus::UI::VBox::;
1894 2388
1895sub new { 2389sub new {
1896 my ($class, %arg) = @_; 2390 my ($class, %arg) = @_;
1897 2391
1898 my $self = $class->SUPER::new ( 2392 my $self = $class->SUPER::new (
… …
1900 can_hover => 1, 2394 can_hover => 1,
1901 can_events => 1, 2395 can_events => 1,
1902 %arg, 2396 %arg,
1903 ); 2397 );
1904 2398
1905 $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999"); 2399 $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); 2400 $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"); 2401 $self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
1908 2402
1909 $self 2403 $self
1910} 2404}
1911 2405
1912sub set_fontsize { 2406sub set_fontsize {
… …
1933 $self->{value}->set_text ($val); 2427 $self->{value}->set_text ($val);
1934} 2428}
1935 2429
1936############################################################################# 2430#############################################################################
1937 2431
1938package CFClient::UI::Slider; 2432package CFPlus::UI::Slider;
1939 2433
1940use strict; 2434use strict;
1941 2435
1942use CFClient::OpenGL; 2436use CFPlus::OpenGL;
1943 2437
1944our @ISA = CFClient::UI::DrawBG::; 2438our @ISA = CFPlus::UI::DrawBG::;
1945 2439
1946my @tex = 2440my @tex =
1947 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2441 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1948 qw(s1_slider.png s1_slider_bg.png); 2442 qw(s1_slider.png s1_slider_bg.png);
1949 2443
1950sub new { 2444sub new {
1951 my $class = shift; 2445 my $class = shift;
1952 2446
1953 # range [value, low, high, page] 2447 # range [value, low, high, page, unit]
1954 2448
1955 # TODO: 0-width page 2449 # TODO: 0-width page
1956 # TODO: req_w/h are wrong with vertical 2450 # TODO: req_w/h are wrong with vertical
1957 # TODO: calculations are off 2451 # TODO: calculations are off
1958 my $self = $class->SUPER::new ( 2452 my $self = $class->SUPER::new (
1959 fg => [1, 1, 1], 2453 fg => [1, 1, 1],
1960 active_fg => [0, 0, 0], 2454 active_fg => [0, 0, 0],
2455 bg => [0, 0, 0, 0.2],
2456 active_bg => [1, 1, 1, 0.5],
1961 range => [0, 0, 100, 10], 2457 range => [0, 0, 100, 10, 0],
1962 req_w => 20, 2458 min_w => $::WIDTH / 80,
1963 req_h => 20, 2459 min_h => $::WIDTH / 80,
1964 vertical => 0, 2460 vertical => 0,
1965 can_hover => 1, 2461 can_hover => 1,
1966 inner_pad => 5, 2462 inner_pad => 0.02,
1967 @_ 2463 @_
1968 ); 2464 );
1969 2465
2466 $self->set_value ($self->{range}[0]);
2467 $self->update;
2468
1970 $self 2469 $self
1971} 2470}
1972 2471
2472sub set_range {
2473 my ($self, $range) = @_;
2474
2475 ($range, $self->{range}) = ($self->{range}, $range);
2476
2477 if ("@$range" ne "@{$self->{range}}") {
2478 $self->update;
2479 $self->set_value ($self->{range}[0]);
2480 }
2481}
2482
2483sub set_value {
2484 my ($self, $value) = @_;
2485
2486 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2487
2488 $hi = $lo + 1 if $hi <= $lo;
2489
2490 $page = $hi - $lo if $page > $hi - $lo;
2491
2492 $value = $lo if $value < $lo;
2493 $value = $hi - $page if $value > $hi - $page;
2494
2495 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2496 if $unit;
2497
2498 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2499
2500 if ($value != $old_value) {
2501 $self->emit (changed => $value);
2502 $self->update;
2503 }
2504}
2505
1973sub size_request { 2506sub size_request {
1974 my ($self) = @_; 2507 my ($self) = @_;
1975 2508
1976 my $w = $self->{req_w}; 2509 ($self->{req_w}, $self->{req_h})
1977 my $h = $self->{req_h};
1978
1979 $self->{vertical} ? ($h, $w) : ($w, $h)
1980} 2510}
1981 2511
1982sub button_down { 2512sub invoke_button_down {
1983 my ($self, $ev, $x, $y) = @_; 2513 my ($self, $ev, $x, $y) = @_;
1984 2514
1985 $self->SUPER::button_down ($ev, $x, $y); 2515 $self->SUPER::invoke_button_down ($ev, $x, $y);
2516
2517 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2518
1986 $self->mouse_motion ($ev, $x, $y); 2519 $self->invoke_mouse_motion ($ev, $x, $y)
1987} 2520}
1988 2521
1989sub mouse_motion { 2522sub invoke_mouse_motion {
1990 my ($self, $ev, $x, $y) = @_; 2523 my ($self, $ev, $x, $y) = @_;
1991 2524
1992 if ($GRAB == $self) { 2525 if ($GRAB == $self) {
2526 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2527
2528 my (undef, $lo, $hi, $page) = @{$self->{range}};
2529
2530 $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
2531
2532 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2533 } else {
2534 return 0;
2535 }
2536
2537 1
2538}
2539
2540sub invoke_mouse_wheel {
2541 my ($self, $ev) = @_;
2542
2543 my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2544
2545 $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2546
2547 ! ! $delta
2548}
2549
2550sub update {
2551 my ($self) = @_;
2552
2553 delete $self->{knob_w};
2554 $self->SUPER::update;
2555}
2556
2557sub _draw {
2558 my ($self) = @_;
2559
2560 unless ($self->{knob_w}) {
2561 $self->set_value ($self->{range}[0]);
2562
1993 my ($value, $lo, $hi, $page) = @{$self->{range}}; 2563 my ($value, $lo, $hi, $page) = @{$self->{range}};
2564 my $range = ($hi - $page - $lo) || 1e-100;
1994 2565
1995 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 2566 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1996 2567
1997 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 2568 $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 2569 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1999 2570
2000 $x -= $inner_pad_px; # substract the padding 2571 $value = ($value - $lo) / $range;
2001 $x = $x * ($hi - $lo) / $inner_w + $lo; 2572 $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 2573
2006 $self->emit (changed => $x); 2574 $self->{knob_x} = $value - $knob_w * 0.5;
2007 $self->update; 2575 $self->{knob_w} = $knob_w;
2008 } 2576 }
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 2577
2022 $self->SUPER::_draw (); 2578 $self->SUPER::_draw ();
2023 2579
2024 my ($w, $h) = @$self{qw(w h)}; 2580 glScale $self->{w}, $self->{h};
2025 2581
2026 if ($self->{vertical}) { 2582 if ($self->{vertical}) {
2027 # draw a vertical slider like a rotated horizontal slider 2583 # draw a vertical slider like a rotated horizontal slider
2028 2584
2585 glTranslate 1, 0, 0;
2029 glRotate 90, 0, 0, 1; 2586 glRotate 90, 0, 0, 1;
2030 glTranslate 0, -$self->{w}, 0;
2031
2032 ($w, $h) = ($h, $w);
2033 } 2587 }
2034 2588
2035 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 2589 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
2036 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 2590 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
2037 2591
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; 2592 glEnable GL_TEXTURE_2D;
2059 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2593 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2060 2594
2061 # draw background 2595 # draw background
2062 $tex[1]->draw_quad (0, 0, $w, $h); 2596 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
2063 2597
2064 # draw handle 2598 # draw handle
2065 $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h); 2599 $tex[0]->draw_quad_alpha ($self->{knob_x}, 0, $self->{knob_w}, 1);
2066 2600
2067 glDisable GL_BLEND;
2068 glDisable GL_TEXTURE_2D; 2601 glDisable GL_TEXTURE_2D;
2069} 2602}
2070 2603
2071############################################################################# 2604#############################################################################
2072 2605
2073package CFClient::UI::TextView; 2606package CFPlus::UI::ValSlider;
2074 2607
2075our @ISA = CFClient::UI::HBox::; 2608our @ISA = CFPlus::UI::HBox::;
2076 2609
2610sub new {
2611 my ($class, %arg) = @_;
2612
2613 my $range = delete $arg{range};
2614
2615 my $self = $class->SUPER::new (
2616 slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2617 entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2618 to_value => sub { shift },
2619 from_value => sub { shift },
2620 %arg,
2621 );
2622
2623 $self->{slider}->connect (changed => sub {
2624 my ($self, $value) = @_;
2625 $self->{parent}{entry}->set_text ($self->{parent}{to_value}->($value));
2626 $self->{parent}->emit (changed => $value);
2627 });
2628
2629# $self->{entry}->connect (changed => sub {
2630# my ($self, $value) = @_;
2631# $self->{parent}{slider}->set_value ($self->{parent}{from_value}->($value));
2632# $self->{parent}->emit (changed => $value);
2633# });
2634
2635 $self->add ($self->{slider}, $self->{entry});
2636
2637 $self->{slider}->emit (changed => $self->{slider}{range}[0]);
2638
2639 $self
2640}
2641
2642sub set_range { shift->{slider}->set_range (@_) }
2643sub set_value { shift->{slider}->set_value (@_) }
2644
2645#############################################################################
2646
2647package CFPlus::UI::TextScroller;
2648
2649our @ISA = CFPlus::UI::HBox::;
2650
2077use CFClient::OpenGL; 2651use CFPlus::OpenGL;
2078 2652
2079sub new { 2653sub new {
2080 my $class = shift; 2654 my $class = shift;
2081 2655
2082 my $self = $class->SUPER::new ( 2656 my $self = $class->SUPER::new (
2083 fontsize => 1, 2657 fontsize => 1,
2084 can_events => 0, 2658 can_events => 1,
2659 indent => 0,
2085 #font => default_font 2660 #font => default_font
2086 @_, 2661 @_,
2087 2662
2088 layout => (new CFClient::Layout), 2663 layout => (new CFPlus::Layout),
2089 par => [], 2664 par => [],
2090 height => 0, 2665 height => 0,
2091 children => [ 2666 children => [
2092 (new CFClient::UI::Empty expand => 1), 2667 (new CFPlus::UI::Empty expand => 1),
2093 (new CFClient::UI::Slider vertical => 1), 2668 (new CFPlus::UI::Slider vertical => 1),
2094 ], 2669 ],
2095 ); 2670 );
2096 2671
2097 $self->{children}[1]->connect (changed => sub { $self->update }); 2672 $self->{children}[1]->connect (changed => sub { $self->update });
2098 2673
… …
2104 2679
2105 $self->{fontsize} = $fontsize; 2680 $self->{fontsize} = $fontsize;
2106 $self->reflow; 2681 $self->reflow;
2107} 2682}
2108 2683
2109sub text_height { 2684sub size_request {
2685 my ($self) = @_;
2686
2687 my ($empty, $slider) = @{ $self->{children} };
2688
2689 local $self->{children} = [$empty, $slider];
2690 $self->SUPER::size_request
2691}
2692
2693sub invoke_size_allocate {
2694 my ($self, $w, $h) = @_;
2695
2696 my ($empty, $slider, @other) = @{ $self->{children} };
2697 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2698
2699 $self->{layout}->set_font ($self->{font}) if $self->{font};
2700 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2701 $self->{layout}->set_width ($empty->{w});
2702 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2703
2704 $self->reflow;
2705
2706 local $self->{children} = [$empty, $slider];
2707 $self->SUPER::invoke_size_allocate ($w, $h)
2708}
2709
2710sub invoke_mouse_wheel {
2110 my ($self, $text) = @_; 2711 my ($self, $ev) = @_;
2712
2713 return 0 unless $ev->{dy}; # only vertical movements
2714
2715 $self->{children}[1]->emit (mouse_wheel => $ev);
2716
2717 1
2718}
2719
2720sub get_layout {
2721 my ($self, $para) = @_;
2111 2722
2112 my $layout = $self->{layout}; 2723 my $layout = $self->{layout};
2113 2724
2725 $layout->set_font ($self->{font}) if $self->{font};
2726 $layout->set_foreground (@{$para->{fg}});
2114 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 2727 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2115 $layout->set_width ($self->{children}[0]{w}); 2728 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2116 $layout->set_text ($text); 2729 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2730 $layout->set_markup ($para->{markup});
2731
2732 $layout->set_shapes (
2733 map
2734 +(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2735 @{$para->{widget}}
2117 2736 );
2118 ($layout->size)[1] 2737
2738 $layout
2119} 2739}
2120 2740
2121sub reflow { 2741sub reflow {
2122 my ($self) = @_; 2742 my ($self) = @_;
2123 2743
2124 $self->{need_reflow}++; 2744 $self->{need_reflow}++;
2125 $self->update; 2745 $self->update;
2126} 2746}
2127 2747
2128sub size_allocate { 2748sub set_offset {
2749 my ($self, $offset) = @_;
2750
2751 # todo: base offset on lines or so, not on pixels
2752 $self->{children}[1]->set_value ($offset);
2753}
2754
2755sub current_paragraph {
2756 my ($self) = @_;
2757
2758 $self->force_uptodate;
2759 $self->{top_paragraph} - 1
2760}
2761
2762sub scroll_to {
2129 my ($self, $w, $h) = @_; 2763 my ($self, $para) = @_;
2130 2764
2131 $self->SUPER::size_allocate ($w, $h); 2765 $self->force_uptodate;
2132 2766
2133 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2767 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2134 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2135 $self->{layout}->set_width ($self->{children}[0]{w});
2136 2768
2137 $self->reflow; 2769 $self->{children}[1]->set_value ($self->{par}[$para]{y});
2770}
2771
2772sub clear {
2773 my ($self) = @_;
2774
2775 my (undef, undef, @other) = @{ $self->{children} };
2776 $self->remove ($_) for @other;
2777
2778 $self->{par} = [];
2779 $self->{height} = 0;
2780 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2138} 2781}
2139 2782
2140sub add_paragraph { 2783sub add_paragraph {
2141 my ($self, $color, $text) = @_; 2784 my $self = shift;
2142 2785
2143 #TODO: intelligently "reformat" paragraph 2786 for my $para (@_) {
2787 $para = {
2788 fg => [1, 1, 1, 1],
2789 indent => 0,
2790 markup => "",
2791 widget => [],
2792 ref $para ? %$para : (markup => $para),
2793 w => 1e10,
2794 wrapped => 1,
2795 };
2144 2796
2145 my $height = $self->text_height ($text); 2797 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2798 push @{$self->{par}}, $para;
2799 }
2146 2800
2801 $self->{need_reflow}++;
2802 $self->update;
2803}
2804
2805sub scroll_to_bottom {
2806 my ($self) = @_;
2807
2808 $self->{scroll_to_bottom} = 1;
2809 $self->update;
2810}
2811
2812sub force_uptodate {
2813 my ($self) = @_;
2814
2815 if (delete $self->{need_reflow}) {
2816 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2817
2818 my $height = 0;
2819 my $paridx;
2820 my $top_paragraph;
2821 my $top = int $self->{children}[1]{range}[0];
2822
2823 for my $para (@{$self->{par}}) {
2824 if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2825 my $layout = $self->get_layout ($para);
2826 my ($w, $h) = $layout->size;
2827
2828 $para->{w} = $w + $para->{indent};
2829 $para->{h} = $h;
2830 $para->{wrapped} = $layout->has_wrapped;
2831 }
2832
2833 $para->{y} = $height;
2834
2835 $paridx++;
2836 $top_paragraph ||= $paridx if $height >= $top;
2837
2838 $height += $para->{h};
2839 }
2840
2841 $self->{top_paragraph} = $top_paragraph;
2147 $self->{height} += $height; 2842 $self->{height} = $height;
2148 2843
2149 push @{$self->{par}}, [$height, $color, $text]; 2844 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2150 2845
2151 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 2846 delete $self->{texture};
2152 $self->{children}[1]->update; 2847 }
2848
2849 if (delete $self->{scroll_to_bottom}) {
2850 $self->{children}[1]->set_value (1e10);
2851 }
2153} 2852}
2154 2853
2155sub update { 2854sub update {
2156 my ($self) = @_; 2855 my ($self) = @_;
2157 2856
… …
2159 2858
2160 return unless $self->{h} > 0; 2859 return unless $self->{h} > 0;
2161 2860
2162 delete $self->{texture}; 2861 delete $self->{texture};
2163 2862
2164 $ROOT->on_refresh ($self, sub { 2863 $ROOT->on_post_alloc ($self => sub {
2165 if (delete $self->{need_reflow}) { 2864 $self->force_uptodate;
2166 my $height = 0;
2167 2865
2168 $height += $_->[0] = $self->text_height ($_->[2]) 2866 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2169 for @{$self->{par}};
2170 2867
2171 $self->{height} = $height; 2868 $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; 2869 glClearColor 0, 0, 0, 0;
2180 glClear GL_COLOR_BUFFER_BIT; 2870 glClear GL_COLOR_BUFFER_BIT;
2181 2871
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]; 2872 my $top = int $self->{children}[1]{range}[0];
2188 2873
2189 my $y0 = $top; 2874 my $y0 = $top;
2190 my $y1 = $top + $self->{h}; 2875 my $y1 = $top + $H;
2191 2876
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}}) { 2877 for my $para (@{$self->{par}}) {
2199 my $h = $par->[0]; 2878 my $h = $para->{h};
2879 my $y = $para->{y};
2200 2880
2201 if ($y0 < $y + $h && $y < $y1) { 2881 if ($y0 < $y + $h && $y < $y1) {
2202 $layout->set_text ($par->[2]); 2882 my $layout = $self->get_layout ($para);
2203 2883
2204 glColor @{ $par->[1] }; 2884 $layout->render ($para->{indent}, $y - $y0);
2205 my ($W, $H) = $layout->size; 2885
2206 CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0); 2886 if (my @w = @{ $para->{widget} }) {
2887 my @s = $layout->get_shapes;
2888
2889 for (@w) {
2890 my ($dx, $dy) = splice @s, 0, 2, ();
2891
2892 $_->{x} = $dx + $para->{indent};
2893 $_->{y} = $dy + $y - $y0;
2894
2895 $_->draw;
2896 }
2897 }
2207 } 2898 }
2208
2209 $y += $h;
2210 } 2899 }
2211
2212 glDisable GL_TEXTURE_2D;
2213 glDisable GL_BLEND;
2214 }; 2900 };
2215 }); 2901 });
2216} 2902}
2217 2903
2904sub reconfigure {
2905 my ($self) = @_;
2906
2907 $self->SUPER::reconfigure;
2908
2909 $_->{w} = 1e10 for @{ $self->{par} };
2910 $self->reflow;
2911}
2912
2218sub _draw { 2913sub _draw {
2219 my ($self) = @_; 2914 my ($self) = @_;
2220 2915
2221 glEnable GL_BLEND;
2222 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2223 glEnable GL_TEXTURE_2D; 2916 glEnable GL_TEXTURE_2D;
2224 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2917 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2225 glColor 1, 1, 1, 1; 2918 glColor 0, 0, 0, 1;
2226 $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h}); 2919 $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
2227 glDisable GL_TEXTURE_2D; 2920 glDisable GL_TEXTURE_2D;
2228 glDisable GL_BLEND;
2229 2921
2230 $self->{children}[1]->draw; 2922 $self->{children}[1]->draw;
2231
2232} 2923}
2233 2924
2234############################################################################# 2925#############################################################################
2235 2926
2236package CFClient::UI::Animator; 2927package CFPlus::UI::Animator;
2237 2928
2238use CFClient::OpenGL; 2929use CFPlus::OpenGL;
2239 2930
2240our @ISA = CFClient::UI::Bin::; 2931our @ISA = CFPlus::UI::Bin::;
2241 2932
2242sub moveto { 2933sub moveto {
2243 my ($self, $x, $y) = @_; 2934 my ($self, $x, $y) = @_;
2244 2935
2245 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 2936 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2273 glPopMatrix; 2964 glPopMatrix;
2274} 2965}
2275 2966
2276############################################################################# 2967#############################################################################
2277 2968
2278package CFClient::UI::Flopper; 2969package CFPlus::UI::Flopper;
2279 2970
2280our @ISA = CFClient::UI::Button::; 2971our @ISA = CFPlus::UI::Button::;
2281 2972
2282sub new { 2973sub new {
2283 my $class = shift; 2974 my $class = shift;
2284 2975
2285 my $self = $class->SUPER::new ( 2976 my $self = $class->SUPER::new (
2286 state => 0, 2977 state => 0,
2287 connect_activate => \&toggle_flopper, 2978 on_activate => \&toggle_flopper,
2288 @_ 2979 @_
2289 ); 2980 );
2290 2981
2291 if ($self->{state}) {
2292 $self->{state} = 0;
2293 $self->toggle_flopper;
2294 }
2295
2296 $self 2982 $self
2297} 2983}
2298 2984
2299sub toggle_flopper { 2985sub toggle_flopper {
2300 my ($self) = @_; 2986 my ($self) = @_;
2301 2987
2302 # TODO: use animation 2988 $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} 2989}
2314 2990
2315############################################################################# 2991#############################################################################
2316 2992
2317package CFClient::UI::Tooltip; 2993package CFPlus::UI::Tooltip;
2318 2994
2319our @ISA = CFClient::UI::Bin::; 2995our @ISA = CFPlus::UI::Bin::;
2320 2996
2321use CFClient::OpenGL; 2997use CFPlus::OpenGL;
2322 2998
2323sub new { 2999sub new {
2324 my $class = shift; 3000 my $class = shift;
2325 3001
2326 $class->SUPER::new ( 3002 $class->SUPER::new (
2327 @_, 3003 @_,
2328 can_events => 0, 3004 can_events => 0,
2329 ) 3005 )
2330} 3006}
2331 3007
2332sub set_markup { 3008sub set_tooltip_from {
2333 my ($self, $text) = @_; 3009 my ($self, $widget) = @_;
2334 3010
2335 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3011 $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
2336 $self->{label}->set_markup ($text); 3012 if $widget->{tooltip} =~ /^#(.*)$/;
2337 $self->add ($self->{label}); 3013
3014 my $tooltip = $widget->{tooltip};
3015
3016 if ($ENV{CFPLUS_DEBUG} & 2) {
3017 $tooltip .= "\n\n" . (ref $widget) . "\n"
3018 . "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3019 . "req $widget->{req_w} $widget->{req_h}\n"
3020 . "visible $widget->{visible}";
3021 }
3022
3023 $tooltip =~ s/^\n+//;
3024 $tooltip =~ s/\n+$//;
3025
3026 $self->add (new CFPlus::UI::Label
3027 markup => $tooltip,
3028 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3029 fontsize => 0.8,
3030 style => 1, # FLAG_INVERSE
3031 ellipsise => 0,
3032 font => ($widget->{tooltip_font} || $::FONT_PROP),
3033 );
2338} 3034}
2339 3035
2340sub size_request { 3036sub size_request {
2341 my ($self) = @_; 3037 my ($self) = @_;
2342 3038
2343 $self->child->set_max_size ($::WIDTH * 0.3);
2344
2345 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3039 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2346 3040
2347 ($w + 4, $h + 4) 3041 ($w + 4, $h + 4)
2348} 3042}
2349 3043
2350sub size_allocate { 3044sub invoke_size_allocate {
2351 my ($self, $w, $h) = @_; 3045 my ($self, $w, $h) = @_;
2352 3046
2353 $self->SUPER::size_allocate ($w - 4, $h - 4); 3047 $self->SUPER::invoke_size_allocate ($w - 4, $h - 4)
3048}
3049
3050sub invoke_visibility_change {
3051 my ($self, $visible) = @_;
3052
3053 return unless $visible;
3054
3055 $self->{root}->on_post_alloc ("move_$self" => sub {
3056 my $widget = $self->{owner}
3057 or return;
3058
3059 if ($widget->{visible}) {
3060 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
3061
3062 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
3063 if $x + $self->{w} > $self->{root}{w};
3064
3065 $self->move_abs ($x, $y);
3066 } else {
3067 $self->hide;
3068 }
3069 });
2354} 3070}
2355 3071
2356sub _draw { 3072sub _draw {
2357 my ($self) = @_; 3073 my ($self) = @_;
2358 3074
2359 glPushMatrix;
2360 glTranslate 0.375, 0.375; 3075 glTranslate 0.375, 0.375;
2361 3076
2362 my ($w, $h) = @$self{qw(w h)}; 3077 my ($w, $h) = @$self{qw(w h)};
2363 3078
2364 glColor 1, 0.8, 0.4; 3079 glColor 1, 0.8, 0.4;
… …
2375 glVertex 0 , $h; 3090 glVertex 0 , $h;
2376 glVertex $w, $h; 3091 glVertex $w, $h;
2377 glVertex $w, 0; 3092 glVertex $w, 0;
2378 glEnd; 3093 glEnd;
2379 3094
2380 glPopMatrix; 3095 glTranslate 2 - 0.375, 2 - 0.375;
2381 3096
2382 glTranslate 2, 2;
2383 $self->SUPER::_draw; 3097 $self->SUPER::_draw;
2384} 3098}
2385 3099
2386############################################################################# 3100#############################################################################
2387 3101
2388package CFClient::UI::Face; 3102package CFPlus::UI::Face;
2389 3103
2390our @ISA = CFClient::UI::Base::; 3104our @ISA = CFPlus::UI::DrawBG::;
2391 3105
2392use CFClient::OpenGL; 3106use CFPlus::OpenGL;
2393 3107
2394sub new { 3108sub new {
2395 my $class = shift; 3109 my $class = shift;
2396 3110
2397 $class->SUPER::new ( 3111 my $self = $class->SUPER::new (
2398 aspect => 1, 3112 aspect => 1,
3113 can_events => 0,
2399 @_, 3114 @_,
2400 ) 3115 );
3116
3117 if ($self->{anim} && $self->{animspeed}) {
3118 Scalar::Util::weaken (my $widget = $self);
3119
3120 $self->{timer} = Event->timer (
3121 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3122 hard => 1,
3123 interval => $self->{animspeed},
3124 cb => sub {
3125 ++$widget->{frame};
3126 $widget->update;
3127 },
3128 );
3129 }
3130
3131 $self
2401} 3132}
2402 3133
2403sub size_request { 3134sub size_request {
2404 (32, 8) 3135 (32, 8)
2405} 3136}
2406 3137
3138sub update {
3139 my ($self) = @_;
3140
3141 return unless $self->{visible};
3142
3143 $self->SUPER::update;
3144}
3145
2407sub _draw { 3146sub _draw {
2408 my ($self) = @_; 3147 my ($self) = @_;
2409 3148
3149 return unless $::CONN;
3150
3151 $self->SUPER::_draw;
3152
3153 my $face;
3154
3155 if ($self->{frame}) {
3156 my $anim = $::CONN->{anim}[$self->{anim}];
3157
3158 $face = $anim->[ $self->{frame} % @$anim ]
3159 if $anim && @$anim;
3160 }
3161
2410 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3162 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2411 3163
2412 # TODO animation
2413 if ($tex) { 3164 if ($tex) {
2414 glEnable GL_BLEND;
2415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2416 glEnable GL_TEXTURE_2D; 3165 glEnable GL_TEXTURE_2D;
2417 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3166 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2418 glColor 1, 1, 1, 1; 3167 glColor 0, 0, 0, 1;
2419 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3168 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2420 glDisable GL_TEXTURE_2D; 3169 glDisable GL_TEXTURE_2D;
2421 glDisable GL_BLEND;
2422 } 3170 }
3171}
3172
3173sub destroy {
3174 my ($self) = @_;
3175
3176 $self->{timer}->cancel
3177 if $self->{timer};
3178
3179 $self->SUPER::destroy;
2423} 3180}
2424 3181
2425############################################################################# 3182#############################################################################
2426 3183
3184package CFPlus::UI::Buttonbar;
3185
3186our @ISA = CFPlus::UI::HBox::;
3187
3188# TODO: should actualyl wrap buttons and other goodies.
3189
3190#############################################################################
3191
2427package CFClient::UI::Menu; 3192package CFPlus::UI::Menu;
2428 3193
2429our @ISA = CFClient::UI::FancyFrame::; 3194our @ISA = CFPlus::UI::FancyFrame::;
2430 3195
2431use CFClient::OpenGL; 3196use CFPlus::OpenGL;
2432 3197
2433sub new { 3198sub new {
2434 my $class = shift; 3199 my $class = shift;
2435 3200
2436 my $self = $class->SUPER::new ( 3201 my $self = $class->SUPER::new (
2437 items => [], 3202 items => [],
2438 z => 100, 3203 z => 100,
2439 @_, 3204 @_,
2440 ); 3205 );
2441 3206
2442 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3207 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
2443 3208
2444 for my $item (@{ $self->{items} }) { 3209 for my $item (@{ $self->{items} }) {
2445 my ($widget, $cb) = @$item; 3210 my ($widget, $cb, $tooltip) = @$item;
2446 3211
2447 # handle various types of items, only text for now 3212 # handle various types of items, only text for now
2448 if (!ref $widget) { 3213 if (!ref $widget) {
3214 if ($widget =~ /\t/) {
3215 my ($left, $right) = split /\t/, $widget, 2;
3216
2449 $widget = new CFClient::UI::Label 3217 $widget = new CFPlus::UI::HBox
2450 can_hover => 1, 3218 can_hover => 1,
2451 can_events => 1, 3219 can_events => 1,
3220 tooltip => $tooltip,
3221 children => [
3222 (new CFPlus::UI::Label markup => $left, expand => 1),
3223 (new CFPlus::UI::Label markup => $right, align => +1),
3224 ],
3225 ;
3226
3227 } else {
3228 $widget = new CFPlus::UI::Label
3229 can_hover => 1,
3230 can_events => 1,
2452 text => $widget; 3231 markup => $widget,
3232 tooltip => $tooltip;
3233 }
2453 } 3234 }
2454 3235
2455 $self->{item}{$widget} = $item; 3236 $self->{item}{$widget} = $item;
2456 3237
2457 $self->{vbox}->add ($widget); 3238 $self->{vbox}->add ($widget);
… …
2469 # maybe save $GRAB? must be careful about events... 3250 # maybe save $GRAB? must be careful about events...
2470 $GRAB = $self; 3251 $GRAB = $self;
2471 $self->{button} = $ev->{button}; 3252 $self->{button} = $ev->{button};
2472 3253
2473 $self->show; 3254 $self->show;
2474 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5); 3255 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2475} 3256}
2476 3257
2477sub mouse_motion { 3258sub invoke_mouse_motion {
2478 my ($self, $ev, $x, $y) = @_; 3259 my ($self, $ev, $x, $y) = @_;
2479 3260
2480 # TODO: should use vbox->fdind_widget or so 3261 # TODO: should use vbox->find_widget or so
2481 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3262 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2482 $self->{hover} = $self->{item}{$HOVER}; 3263 $self->{hover} = $self->{item}{$HOVER};
2483}
2484 3264
3265 0
3266}
3267
2485sub button_up { 3268sub invoke_button_up {
2486 my ($self, $ev, $x, $y) = @_; 3269 my ($self, $ev, $x, $y) = @_;
2487 3270
2488 if ($ev->{button} == $self->{button}) { 3271 if ($ev->{button} == $self->{button}) {
2489 undef $GRAB; 3272 undef $GRAB;
2490 $self->hide; 3273 $self->hide;
2491 3274
2492 $self->emit ("popdown"); 3275 $self->emit ("popdown");
2493 $self->{hover}[1]->() if $self->{hover}; 3276 $self->{hover}[1]->() if $self->{hover};
3277 } else {
3278 return 0
3279 }
3280
2494 } 3281 1
2495} 3282}
2496 3283
2497############################################################################# 3284#############################################################################
2498 3285
2499package CFClient::UI::Root; 3286package CFPlus::UI::Multiplexer;
2500 3287
2501our @ISA = CFClient::UI::Container::; 3288our @ISA = CFPlus::UI::Container::;
2502 3289
2503use CFClient::OpenGL; 3290sub new {
3291 my $class = shift;
2504 3292
2505sub check_size { 3293 my $self = $class->SUPER::new (
3294 @_,
3295 );
3296
3297 $self->{current} = $self->{children}[0]
3298 if @{ $self->{children} };
3299
3300 $self
3301}
3302
3303sub add {
2506 my ($self) = @_; 3304 my ($self, @widgets) = @_;
2507 3305
2508 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3306 $self->SUPER::add (@widgets);
3307
3308 $self->{current} = $self->{children}[0]
3309 if @{ $self->{children} };
3310}
3311
3312sub get_current_page {
3313 my ($self) = @_;
3314
3315 $self->{current}
3316}
3317
3318sub set_current_page {
3319 my ($self, $page_or_widget) = @_;
3320
3321 my $widget = ref $page_or_widget
3322 ? $page_or_widget
3323 : $self->{children}[$page_or_widget];
3324
3325 $self->{current} = $widget;
3326 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3327
3328 $self->emit (page_changed => $self->{current});
3329
3330 $self->realloc;
3331}
3332
3333sub visible_children {
3334 $_[0]{current}
2509} 3335}
2510 3336
2511sub size_request { 3337sub size_request {
2512 ($::WIDTH, $::HEIGHT) 3338 my ($self) = @_;
2513}
2514 3339
3340 $self->{current}->size_request
3341}
3342
3343sub invoke_size_allocate {
3344 my ($self, $w, $h) = @_;
3345
3346 $self->{current}->configure (0, 0, $w, $h);
3347
3348 1
3349}
3350
3351sub _draw {
3352 my ($self) = @_;
3353
3354 $self->{current}->draw;
3355}
3356
3357#############################################################################
3358
3359package CFPlus::UI::Notebook;
3360
3361our @ISA = CFPlus::UI::VBox::;
3362
3363sub new {
3364 my $class = shift;
3365
3366 my $self = $class->SUPER::new (
3367 buttonbar => (new CFPlus::UI::Buttonbar),
3368 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3369 # filter => # will be put between multiplexer and $self
3370 @_,
3371 );
3372
3373 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3374 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3375
3376 $self
3377}
3378
3379sub add {
3380 my ($self, $title, $widget, $tooltip) = @_;
3381
3382 Scalar::Util::weaken $self;
3383
3384 $self->{buttonbar}->add (new CFPlus::UI::Button
3385 markup => $title,
3386 tooltip => $tooltip,
3387 on_activate => sub { $self->set_current_page ($widget) },
3388 );
3389
3390 $self->{multiplexer}->add ($widget);
3391}
3392
3393sub get_current_page {
3394 my ($self) = @_;
3395
3396 $self->{multiplexer}->get_current_page
3397}
3398
3399sub set_current_page {
3400 my ($self, $page) = @_;
3401
3402 $self->{multiplexer}->set_current_page ($page);
3403 $self->emit (page_changed => $self->{multiplexer}{current});
3404}
3405
3406#############################################################################
3407
3408package CFPlus::UI::Selector;
3409
3410use utf8;
3411
3412our @ISA = CFPlus::UI::Button::;
3413
3414sub new {
3415 my $class = shift;
3416
3417 my $self = $class->SUPER::new (
3418 options => [], # [value, title, longdesc], ...
3419 value => undef,
3420 @_,
3421 );
3422
3423 $self->_set_value ($self->{value});
3424
3425 $self
3426}
3427
3428sub invoke_button_down {
3429 my ($self, $ev) = @_;
3430
3431 my @menu_items;
3432
3433 for (@{ $self->{options} }) {
3434 my ($value, $title, $tooltip) = @$_;
3435
3436 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3437 }
3438
3439 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3440}
3441
3442sub _set_value {
3443 my ($self, $value) = @_;
3444
3445 my ($item) = grep $_->[0] eq $value, @{ $self->{options} }
3446 or return;
3447
3448 $self->{value} = $item->[0];
3449 $self->set_markup ("$item->[1] ⇓");
3450 $self->set_tooltip ($item->[2]);
3451}
3452
3453sub set_value {
3454 my ($self, $value) = @_;
3455
3456 return unless $self->{value} ne $value;
3457
3458 $self->_set_value ($value);
3459 $self->emit (changed => $value);
3460}
3461
3462#############################################################################
3463
3464package CFPlus::UI::Statusbox;
3465
3466our @ISA = CFPlus::UI::VBox::;
3467
3468sub new {
3469 my $class = shift;
3470
3471 my $self = $class->SUPER::new (
3472 fontsize => 0.8,
3473 @_,
3474 );
3475
3476 Scalar::Util::weaken (my $this = $self);
3477
3478 $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3479
3480 $self
3481}
3482
3483sub reorder {
3484 my ($self) = @_;
3485 my $NOW = Time::HiRes::time;
3486
3487 # freeze display when hovering over any label
3488 return if $CFPlus::UI::TOOLTIP->{owner}
3489 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3490 values %{ $self->{item} };
3491
3492 while (my ($k, $v) = each %{ $self->{item} }) {
3493 delete $self->{item}{$k} if $v->{timeout} < $NOW;
3494 }
3495
3496 my @widgets;
3497
3498 my @items = sort {
3499 $a->{pri} <=> $b->{pri}
3500 or $b->{id} <=> $a->{id}
3501 } values %{ $self->{item} };
3502
3503 $self->{timer}->interval (1);
3504
3505 my $count = 10 + 1;
3506 for my $item (@items) {
3507 last unless --$count;
3508
3509 my $label = $item->{label} ||= do {
3510 # TODO: doesn't handle markup well (read as: at all)
3511 my $short = $item->{count} > 1
3512 ? "<b>$item->{count} ×</b> $item->{text}"
3513 : $item->{text};
3514
3515 for ($short) {
3516 s/^\s+//;
3517 s/\s+/ /g;
3518 }
3519
3520 new CFPlus::UI::Label
3521 markup => $short,
3522 tooltip => $item->{tooltip},
3523 tooltip_font => $::FONT_PROP,
3524 tooltip_width => 0.67,
3525 fontsize => $item->{fontsize} || $self->{fontsize},
3526 max_w => $::WIDTH * 0.44,
3527 fg => [@{ $item->{fg} }],
3528 can_events => 1,
3529 can_hover => 1
3530 };
3531
3532 if ((my $diff = $item->{timeout} - $NOW) < 2) {
3533 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3534 $label->update;
3535 $label->set_max_size (undef, $label->{req_h} * $diff)
3536 if $diff < 1;
3537 $self->{timer}->interval (1/30);
3538 } else {
3539 $label->{fg}[3] = $item->{fg}[3] || 1;
3540 }
3541
3542 push @widgets, $label;
3543 }
3544
3545 $self->clear;
3546 $self->SUPER::add (reverse @widgets);
3547}
3548
3549sub add {
3550 my ($self, $text, %arg) = @_;
3551
3552 $text =~ s/^\s+//;
3553 $text =~ s/\s+$//;
3554
3555 return unless $text;
3556
3557 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
3558
3559 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
3560
3561 if (my $item = $self->{item}{$group}) {
3562 if ($item->{text} eq $text) {
3563 $item->{count}++;
3564 } else {
3565 $item->{count} = 1;
3566 $item->{text} = $item->{tooltip} = $text;
3567 }
3568 $item->{id} += 0.2;#d#
3569 $item->{timeout} = $timeout;
3570 delete $item->{label};
3571 } else {
3572 $self->{item}{$group} = {
3573 id => ++$self->{id},
3574 text => $text,
3575 timeout => $timeout,
3576 tooltip => $text,
3577 fg => [0.8, 0.8, 0.8, 0.8],
3578 pri => 0,
3579 count => 1,
3580 %arg,
3581 };
3582 }
3583
3584 $ROOT->on_refresh (reorder => sub {
3585 $self->reorder;
3586 });
3587}
3588
2515sub configure { 3589sub reconfigure {
3590 my ($self) = @_;
3591
3592 delete $_->{label}
3593 for values %{ $self->{item} || {} };
3594
3595 $self->reorder;
3596 $self->SUPER::reconfigure;
3597}
3598
3599sub destroy {
3600 my ($self) = @_;
3601
3602 $self->{timer}->cancel;
3603
3604 $self->SUPER::destroy;
3605}
3606
3607#############################################################################
3608
3609package CFPlus::UI::Inventory;
3610
3611our @ISA = CFPlus::UI::Table::;
3612
3613sub new {
3614 my $class = shift;
3615
3616 my $self = $class->SUPER::new (
3617 col_expand => [0, 1, 0],
3618 items => [],
3619 @_,
3620 );
3621
3622 $self->set_sort_order (undef);
3623
3624 $self
3625}
3626
3627sub update_items {
3628 my ($self) = @_;
3629
3630 $self->clear;
3631
3632 my @item = $self->{sort}->(@{ $self->{items} });
3633
3634 my @adds;
3635 my $row = 0;
3636 for my $item ($self->{sort}->(@{ $self->{items} })) {
3637 CFPlus::Item::update_widgets $item;
3638
3639 push @adds, 0, $row, $item->{face_widget};
3640 push @adds, 1, $row, $item->{desc_widget};
3641 push @adds, 2, $row, $item->{weight_widget};
3642
3643 $row++;
3644 }
3645
3646 $self->add (@adds);
3647}
3648
3649sub set_sort_order {
3650 my ($self, $order) = @_;
3651
3652 $self->{sort} = $order ||= sub {
3653 sort {
3654 $a->{type} <=> $b->{type}
3655 or $a->{name} cmp $b->{name}
3656 } @_
3657 };
3658
3659 $self->update_items;
3660}
3661
3662sub set_items {
3663 my ($self, $items) = @_;
3664
3665 $self->{items} = [$items ? values %$items : ()];
3666 $self->update_items;
3667}
3668
3669#############################################################################
3670
3671package CFPlus::UI::SpellList;
3672
3673our @ISA = CFPlus::UI::Table::;
3674
3675sub new {
3676 my $class = shift;
3677
3678 my $self = $class->SUPER::new (
3679 binding => [],
3680 commands => [],
3681 @_,
3682 )
3683}
3684
3685my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3686
3687my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3688 "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3689my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3690 "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3691my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3692 "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3693my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3694 "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3695my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3696 "<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3697
3698sub rebuild_spell_list {
3699 my ($self) = @_;
3700
3701 $CFPlus::UI::ROOT->on_refresh ($self => sub {
3702 $self->clear;
3703
3704 return unless $::CONN;
3705
3706 $self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3707 $self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3708 $self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3709 $self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3710 $self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3711
3712 my $row = 0;
3713
3714 for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3715 my $spell = $self->{spell}{$_};
3716
3717 $row++;
3718
3719 my $spell_cb = sub {
3720 my ($widget, $ev) = @_;
3721
3722 if ($ev->{button} == 1) {
3723 $::CONN->user_send ("cast $spell->{name}");
3724 } elsif ($ev->{button} == 2) {
3725 $::CONN->user_send ("invoke $spell->{name}");
3726 } elsif ($ev->{button} == 3) {
3727 (new CFPlus::UI::Menu
3728 items => [
3729 ["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3730 ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3731 ],
3732 )->popup ($ev);
3733 } else {
3734 return 0;
3735 }
3736
3737 1
3738 };
3739
3740 my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3741
3742 #TODO: add path info to tooltip
3743 #$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3744
3745 $self->add (0, $row, new CFPlus::UI::Face
3746 face => $spell->{face},
3747 can_hover => 1,
3748 can_events => 1,
3749 tooltip => $tooltip,
3750 on_button_down => $spell_cb,
3751 );
3752
3753 $self->add (1, $row, new CFPlus::UI::Label
3754 expand => 1,
3755 text => $spell->{name},
3756 can_hover => 1,
3757 can_events => 1,
3758 tooltip => $tooltip,
3759 on_button_down => $spell_cb,
3760 );
3761
3762 $self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3763 $self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3764 $self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3765 $self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3766 }
3767 });
3768}
3769
3770sub add_spell {
3771 my ($self, $spell) = @_;
3772
3773 $self->{spell}->{$spell->{name}} = $spell;
3774 $self->rebuild_spell_list;
3775}
3776
3777sub remove_spell {
3778 my ($self, $spell) = @_;
3779
3780 delete $self->{spell}->{$spell->{name}};
3781 $self->rebuild_spell_list;
3782}
3783
3784sub clear_spells {
3785 my ($self) = @_;
3786
3787 $self->{spell} = {};
3788 $self->rebuild_spell_list;
3789}
3790
3791#############################################################################
3792
3793package CFPlus::UI::Root;
3794
3795our @ISA = CFPlus::UI::Container::;
3796
3797use List::Util qw(min max);
3798
3799use CFPlus::OpenGL;
3800
3801sub new {
3802 my $class = shift;
3803
3804 my $self = $class->SUPER::new (
3805 visible => 1,
3806 @_,
3807 );
3808
3809 Scalar::Util::weaken ($self->{root} = $self);
3810
3811 $self
3812}
3813
3814sub size_request {
3815 my ($self) = @_;
3816
3817 ($self->{w}, $self->{h})
3818}
3819
3820sub _to_pixel {
3821 my ($coord, $size, $max) = @_;
3822
3823 $coord =
3824 $coord eq "center" ? ($max - $size) * 0.5
3825 : $coord eq "max" ? $max
3826 : $coord;
3827
3828 $coord = 0 if $coord < 0;
3829 $coord = $max - $size if $coord > $max - $size;
3830
3831 int $coord + 0.5
3832}
3833
3834sub invoke_size_allocate {
2516 my ($self, $x, $y, $w, $h) = @_; 3835 my ($self, $w, $h) = @_;
2517 3836
2518 $self->SUPER::configure ($x, $y, $w, $h);
2519
2520 for my $child (@{$self->{children}}) { 3837 for my $child ($self->children) {
2521 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3838 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2522 3839
2523 $X = List::Util::max 0, List::Util::min $w - $W, $X; 3840 $X = $child->{force_x} if exists $child->{force_x};
2524 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 3841 $Y = $child->{force_y} if exists $child->{force_y};
3842
3843 $X = _to_pixel $X, $W, $self->{w};
3844 $Y = _to_pixel $Y, $H, $self->{h};
3845
2525 $child->configure ($X, $Y, $W,$H); 3846 $child->configure ($X, $Y, $W, $H);
3847 }
3848
2526 } 3849 1
2527} 3850}
2528 3851
2529sub _topleft { 3852sub coord2local {
2530 my ($self, $x, $y) = @_; 3853 my ($self, $x, $y) = @_;
2531 3854
2532 ($x, $y) 3855 ($x, $y)
2533} 3856}
2534 3857
3858sub coord2global {
3859 my ($self, $x, $y) = @_;
3860
3861 ($x, $y)
3862}
3863
2535sub update { 3864sub update {
2536 my ($self) = @_; 3865 my ($self) = @_;
2537 3866
2538 $self->check_size; 3867 $::WANT_REFRESH++;
2539 ::refresh ();
2540} 3868}
2541 3869
2542sub add { 3870sub add {
2543 my ($self, $child) = @_; 3871 my ($self, @children) = @_;
2544 3872
2545 # integerize window positions 3873 $_->{is_toplevel} = 1
2546 $child->{x} = int $child->{x}; 3874 for @children;
2547 $child->{y} = int $child->{y};
2548 3875
2549 $self->SUPER::add ($child); 3876 $self->SUPER::add (@children);
3877}
3878
3879sub remove {
3880 my ($self, @children) = @_;
3881
3882 $self->SUPER::remove (@children);
3883
3884 delete $self->{is_toplevel}
3885 for @children;
3886
3887 while (@children) {
3888 my $w = pop @children;
3889 push @children, $w->children;
3890 $w->set_invisible;
3891 }
2550} 3892}
2551 3893
2552sub on_refresh { 3894sub on_refresh {
2553 my ($self, $id, $cb) = @_; 3895 my ($self, $id, $cb) = @_;
2554 3896
2555 $self->{refresh_hook}{$id} = $cb; 3897 $self->{refresh_hook}{$id} = $cb;
2556} 3898}
2557 3899
3900sub on_post_alloc {
3901 my ($self, $id, $cb) = @_;
3902
3903 $self->{post_alloc_hook}{$id} = $cb;
3904}
3905
2558sub draw { 3906sub draw {
2559 my ($self) = @_; 3907 my ($self) = @_;
2560 3908
2561 while (my $rcb = delete $self->{refresh_hook}) { 3909 while ($self->{refresh_hook}) {
2562 $_->() for values %$rcb; 3910 $_->()
3911 for values %{delete $self->{refresh_hook}};
2563 } 3912 }
3913
3914 if ($self->{realloc}) {
3915 my %queue;
3916 my @queue;
3917 my $widget;
3918
3919 outer:
3920 while () {
3921 if (my $realloc = delete $self->{realloc}) {
3922 for $widget (values %$realloc) {
3923 $widget->{visible} or next; # do not resize invisible widgets
3924
3925 $queue{$widget+0}++ and next; # duplicates are common
3926
3927 push @{ $queue[$widget->{visible}] }, $widget;
3928 }
3929 }
3930
3931 while () {
3932 @queue or last outer;
3933
3934 $widget = pop @{ $queue[-1] || [] }
3935 and last;
3936
3937 pop @queue;
3938 }
3939
3940 delete $queue{$widget+0};
3941
3942 my ($w, $h) = $widget->size_request;
3943
3944 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
3945 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
3946
3947 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3948 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3949
3950 $w = $widget->{force_w} if exists $widget->{force_w};
3951 $h = $widget->{force_h} if exists $widget->{force_h};
3952
3953 if ($widget->{req_w} != $w || $widget->{req_h} != $h
3954 || delete $widget->{force_realloc}) {
3955 $widget->{req_w} = $w;
3956 $widget->{req_h} = $h;
3957
3958 $self->{size_alloc}{$widget+0} = $widget;
3959
3960 if (my $parent = $widget->{parent}) {
3961 $self->{realloc}{$parent+0} = $parent
3962 unless $queue{$parent+0};
3963
3964 $parent->{force_size_alloc} = 1;
3965 $self->{size_alloc}{$parent+0} = $parent;
3966 }
3967 }
3968
3969 delete $self->{realloc}{$widget+0};
3970 }
3971 }
3972
3973 while (my $size_alloc = delete $self->{size_alloc}) {
3974 my @queue = sort { $b->{visible} <=> $a->{visible} }
3975 values %$size_alloc;
3976
3977 while () {
3978 my $widget = pop @queue || last;
3979
3980 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3981
3982 $w = 0 if $w < 0;
3983 $h = 0 if $h < 0;
3984
3985 $w = max $widget->{min_w}, $w;
3986 $h = max $widget->{min_h}, $h;
3987
3988# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3989# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3990
3991 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
3992 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
3993
3994 $w = int $w + 0.5;
3995 $h = int $h + 0.5;
3996
3997 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3998 $widget->{old_w} = $widget->{w};
3999 $widget->{old_h} = $widget->{h};
4000
4001 $widget->{w} = $w;
4002 $widget->{h} = $h;
4003
4004 $widget->emit (size_allocate => $w, $h);
4005 }
4006 }
4007 }
4008
4009 while ($self->{post_alloc_hook}) {
4010 $_->()
4011 for values %{delete $self->{post_alloc_hook}};
4012 }
4013
2564 4014
2565 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4015 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2566 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4016 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2567 glClear GL_COLOR_BUFFER_BIT; 4017 glClear GL_COLOR_BUFFER_BIT;
2568 4018
2569 glMatrixMode GL_PROJECTION; 4019 glMatrixMode GL_PROJECTION;
2570 glLoadIdentity; 4020 glLoadIdentity;
2571 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4021 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2572 glMatrixMode GL_MODELVIEW; 4022 glMatrixMode GL_MODELVIEW;
2573 glLoadIdentity; 4023 glLoadIdentity;
2574 4024
4025 {
4026 package CFPlus::UI::Base;
4027
4028 ($draw_x, $draw_y, $draw_w, $draw_h) =
4029 (0, 0, $self->{w}, $self->{h});
4030 }
4031
2575 $self->_draw; 4032 $self->_draw;
2576} 4033}
2577 4034
2578############################################################################# 4035#############################################################################
2579 4036
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; 4037package CFPlus::UI;
2688 4038
2689$ROOT = new CFClient::UI::Root; 4039$ROOT = new CFPlus::UI::Root;
2690$TOOLTIP = new CFClient::UI::Tooltip; 4040$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2691 4041
26921 40421
2693 4043

Diff Legend

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