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.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.450 by root, Wed Dec 26 15:29:43 2007 UTC

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

Diff Legend

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