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

Diff Legend

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