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.239 by root, Thu May 25 22:29:57 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

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

Diff Legend

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