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.161 by root, Mon Apr 24 03:43:51 2006 UTC vs.
Revision 1.404 by root, Sat Jul 21 22:54:52 2007 UTC

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

Diff Legend

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