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

Diff Legend

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