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.171 by root, Mon Apr 24 11:54:26 2006 UTC vs.
Revision 1.397 by root, Sat Jul 21 14:01:35 2007 UTC

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

Diff Legend

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