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

Diff Legend

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