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.165 by root, Mon Apr 24 08:22:22 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 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, 1/60, 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 (children => [], can_events => 0, %arg); 693 my $self = $class->SUPER::new (
694 children => [],
695 can_events => 0,
696 %arg,
697 );
698
498 $self->add ($_) for @$children; 699 $self->add (@$children)
700 if $children && @$children;
499 701
500 $self 702 $self
501} 703}
502 704
705sub realloc {
706 my ($self) = @_;
707
708 $self->{force_realloc} = 1;
709 $self->{force_size_alloc} = 1;
710 $self->SUPER::realloc;
711}
712
503sub add { 713sub add {
504 my ($self, $child) = @_; 714 my ($self, @widgets) = @_;
505 715
506 $child->set_parent ($self); 716 $_->set_parent ($self)
717 for @widgets;
507 718
719 # TODO: only do this in widgets that need it, e.g. root, fixed
508 use sort 'stable'; 720 use sort 'stable';
509 721
510 $self->{children} = [ 722 $self->{children} = [
511 sort { $a->{z} <=> $b->{z} } 723 sort { $a->{z} <=> $b->{z} }
512 @{$self->{children}}, $child 724 @{$self->{children}}, @widgets
513 ]; 725 ];
514 726
515 $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} }
516} 736}
517 737
518sub remove { 738sub remove {
519 my ($self, $child) = @_; 739 my ($self, @widgets) = @_;
520 740
741 $self->emit (c_remove => \@widgets);
742
743 for my $child (@widgets) {
521 delete $child->{parent}; 744 delete $child->{parent};
522 $child->hide; 745 $child->hide;
523
524 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 746 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
747 }
525 748
526 $self->check_size; 749 $self->realloc;
527 $self->update;
528} 750}
529 751
530sub clear { 752sub clear {
531 my ($self) = @_; 753 my ($self) = @_;
532 754
533 my $children = delete $self->{children}; 755 my $children = $self->{children};
534 $self->{children} = []; 756 $self->{children} = [];
535 757
536 for (@$children) { 758 for (@$children) {
537 delete $_->{parent}; 759 delete $_->{parent};
538 $_->hide; 760 $_->hide;
539 } 761 }
762
763 $self->realloc;
540} 764}
541 765
542sub find_widget { 766sub find_widget {
543 my ($self, $x, $y) = @_; 767 my ($self, $x, $y) = @_;
544 768
545 $x -= $self->{x}; 769 $x -= $self->{x};
546 $y -= $self->{y}; 770 $y -= $self->{y};
547 771
548 my $res; 772 my $res;
549 773
550 for (reverse @{ $self->{children} }) { 774 for (reverse $self->visible_children) {
551 $res = $_->find_widget ($x, $y) 775 $res = $_->find_widget ($x, $y)
552 and return $res; 776 and return $res;
553 } 777 }
554 778
555 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 779 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
556} 780}
557 781
558sub _draw { 782sub _draw {
559 my ($self) = @_; 783 my ($self) = @_;
560 784
561 $_->draw for @{$self->{children}}; 785 $_->draw for $self->visible_children;
562} 786}
563 787
564############################################################################# 788#############################################################################
565 789
566package CFClient::UI::Bin; 790package CFPlus::UI::Bin;
567 791
568our @ISA = CFClient::UI::Container::; 792our @ISA = CFPlus::UI::Container::;
569 793
570sub new { 794sub new {
571 my ($class, %arg) = @_; 795 my ($class, %arg) = @_;
572 796
573 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 797 my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
574 798
575 $class->SUPER::new (children => [$child], %arg) 799 $class->SUPER::new (children => [$child], %arg)
576} 800}
577 801
578sub add { 802sub add {
579 my ($self, $child) = @_; 803 my ($self, $child) = @_;
580 804
581 $self->{children} = []; 805 $self->clear;
582
583 $self->SUPER::add ($child); 806 $self->SUPER::add ($child);
584} 807}
585 808
586sub remove { 809sub remove {
587 my ($self, $widget) = @_; 810 my ($self, $widget) = @_;
588 811
589 $self->SUPER::remove ($widget); 812 $self->SUPER::remove ($widget);
590 813
591 $self->{children} = [new CFClient::UI::Empty] 814 $self->{children} = [new CFPlus::UI::Empty]
592 unless @{$self->{children}}; 815 unless @{$self->{children}};
593} 816}
594 817
595sub child { $_[0]->{children}[0] } 818sub child { $_[0]->{children}[0] }
596 819
597sub size_request { 820sub size_request {
598 $_[0]{children}[0]->size_request 821 $_[0]{children}[0]->size_request
599} 822}
600 823
601sub size_allocate { 824sub invoke_size_allocate {
602 my ($self, $w, $h) = @_; 825 my ($self, $w, $h) = @_;
603 826
604 $self->{children}[0]->configure (0, 0, $w, $h); 827 $self->{children}[0]->configure (0, 0, $w, $h);
828
829 1
605} 830}
606 831
607############################################################################# 832#############################################################################
833# back-buffered drawing area
608 834
609package CFClient::UI::Window; 835package CFPlus::UI::Window;
610 836
611our @ISA = CFClient::UI::Bin::; 837our @ISA = CFPlus::UI::Bin::;
612 838
613use CFClient::OpenGL; 839use CFPlus::OpenGL;
614 840
615sub new { 841sub new {
616 my ($class, %arg) = @_; 842 my ($class, %arg) = @_;
617 843
618 my $self = $class->SUPER::new (%arg); 844 my $self = $class->SUPER::new (%arg);
619} 845}
620 846
621sub update { 847sub update {
622 my ($self) = @_; 848 my ($self) = @_;
623 849
624 # we want to do this delayed... 850 $ROOT->on_post_alloc ($self => sub { $self->render_child });
625 $self->render_chld;
626 $self->SUPER::update; 851 $self->SUPER::update;
627} 852}
628 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
629sub render_chld { 868sub render_child {
630 my ($self) = @_; 869 my ($self) = @_;
631 870
632 $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 {
633 glClearColor 0, 0, 0, 1; 872 glClearColor 0, 0, 0, 0;
634 glClear GL_COLOR_BUFFER_BIT; 873 glClear GL_COLOR_BUFFER_BIT;
635 $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 }
636 }; 883 };
637} 884}
638 885
639sub size_allocate {
640 my ($self, $w, $h) = @_;
641
642 $self->child->configure (0, 0, $w, $h);
643
644 $self->render_chld;
645}
646
647sub _draw { 886sub _draw {
648 my ($self) = @_; 887 my ($self) = @_;
649
650 my ($w, $h) = ($self->w, $self->h);
651 888
652 my $tex = $self->{texture} 889 my $tex = $self->{texture}
653 or return; 890 or return;
654 891
655 glEnable GL_BLEND;
656 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
657 glEnable GL_TEXTURE_2D; 892 glEnable GL_TEXTURE_2D;
658 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;
659 895
660 $tex->draw_quad (0, 0, $w, $h); 896 $tex->draw_quad_alpha_premultiplied (0, 0);
661 897
662 glDisable GL_BLEND;
663 glDisable GL_TEXTURE_2D; 898 glDisable GL_TEXTURE_2D;
664} 899}
665 900
666############################################################################# 901#############################################################################
667 902
668package CFClient::UI::ViewPort; 903package CFPlus::UI::ViewPort;
669 904
905use List::Util qw(min max);
906
670our @ISA = CFClient::UI::Window::; 907our @ISA = CFPlus::UI::Window::;
671
672sub new { die }
673
674sub size_request {
675 my ($self) = @_;
676
677 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
678 $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
679
680 @$self{qw(child_w child_h)}
681}
682
683sub _draw {
684 my ($self) = @_;
685
686 $self->{children}[1]->draw;
687}
688
689
690#############################################################################
691
692package CFClient::UI::Frame;
693
694our @ISA = CFClient::UI::Bin::;
695
696use CFClient::OpenGL;
697 908
698sub new { 909sub new {
699 my $class = shift; 910 my $class = shift;
700 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
701 my $self = $class->SUPER::new ( 1051 $self = $class->SUPER::new (
702 bg => [1, 1, 1, 1], 1052 scroll_x => 0,
703 border_bg => [1, 1, 1, 1], 1053 scroll_y => 1,
704 border => 0.8, 1054 can_events => 1,
705 @_ 1055 hslider => $hslider,
1056 vslider => $vslider,
1057 col_expand => [1, 0],
1058 row_expand => [1, 0],
1059 %arg,
706 ); 1060 );
707 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
708 $self 1087 $self
709} 1088}
710 1089
711sub _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 {
712 my ($self) = @_; 1131 my ($self, $ev) = @_;
713 1132
714 my ($w, $h) = ($self->{w}, $self->{h}); 1133 $self->grab_focus;
715 1134
716 glEnable GL_BLEND; 1135 my $ox = $self->{vp}{view_x};
717 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1136 my $oy = $self->{vp}{view_y};
718 glEnable GL_TEXTURE_2D; 1137
719 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1138 $self->{motion} = sub {
1139 my ($ev, $x, $y) = @_;
720 1140
721# glBegin GL_QUADS; 1141 $ox -= $ev->{xrel};
722# glColor 0, 0, 0, 0; 1142 $oy -= $ev->{yrel};
723# glVertex 0 , 0;
724# glVertex 0 , $h;
725# glVertex $w, $h;
726# glVertex $w, 0;
727# glEnd;
728 1143
1144 $self->{vp}->set_offset ($ox, $oy);
1145 };
1146}
729 1147
730 $self->child->draw; 1148sub invoke_mouse_wheel {
731 glDisable GL_BLEND; 1149 my ($self, $ev) = @_;
732 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)
733} 1194}
734 1195
735############################################################################# 1196#############################################################################
736 1197
737package CFClient::UI::FancyFrame; 1198package CFPlus::UI::Frame;
738 1199
739our @ISA = CFClient::UI::Bin::; 1200our @ISA = CFPlus::UI::Bin::;
740 1201
741use CFClient::OpenGL; 1202use CFPlus::OpenGL;
742
743my @tex =
744 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
745 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
746 1203
747sub new { 1204sub new {
748 my $class = shift; 1205 my $class = shift;
749 1206
750 # 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 }
751 1247
752 my $self = $class->SUPER::new ( 1248 my $self = $class->SUPER::new (
1249 # label => "",
753 bg => [1, 1, 1, 1], 1250 fg => [0.6, 0.3, 0.1],
754 border_bg => [1, 1, 1, 1],
755 border => 0.8, 1251 border => 0.8,
756 @_ 1252 style => 'single',
1253 %arg,
757 ); 1254 );
758 1255
759 $self->{title} &&= new CFClient::UI::Label
760 align => 0,
761 valign => 1,
762 text => $self->{title},
763 fontsize => 1;
764
765 $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};
766} 1264}
767 1265
768sub border { 1266sub border {
769 int $_[0]{border} * $::FONTSIZE 1267 int $_[0]{border} * $::FONTSIZE
770} 1268}
771 1269
772sub size_request { 1270sub size_request {
773 my ($self) = @_; 1271 my ($self) = @_;
1272
1273 ($self->{label_w}, undef) = $self->{label}->size_request
1274 if $self->{label};
774 1275
775 my ($w, $h) = $self->SUPER::size_request; 1276 my ($w, $h) = $self->SUPER::size_request;
776 1277
777 ( 1278 (
778 $w + $self->border * 2, 1279 $w + $self->border * 2,
779 $h + $self->border * 2, 1280 $h + $self->border * 2,
780 ) 1281 )
781} 1282}
782 1283
783sub size_allocate { 1284sub invoke_size_allocate {
784 my ($self, $w, $h) = @_; 1285 my ($self, $w, $h) = @_;
785 1286
786 $h -= List::Util::max 0, $self->border * 2; 1287 my $border = $self->border;
1288
787 $w -= List::Util::max 0, $self->border * 2; 1289 $w -= List::Util::max 0, $border * 2;
1290 $h -= List::Util::max 0, $border * 2;
788 1291
789 $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2) 1292 if (my $label = $self->{label}) {
790 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 }
791 1297
792 $self->child->configure ($self->border, $self->border, $w, $h); 1298 $self->child->configure ($border, $border, $w, $h);
793}
794 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
795sub button_down { 1449sub invoke_button_down {
796 my ($self, $ev, $x, $y) = @_; 1450 my ($self, $ev, $x, $y) = @_;
797 1451
1452 my ($w, $h) = @$self{qw(w h)};
798 my $border = $self->border; 1453 my $border = $self->border;
799 1454
800 if ($x < $self->{w} && $x >= $self->{w} - $border 1455 my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);
801 && $y < $self->{h} && $y >= $self->{h} - $border) { 1456 my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);
802 1457
1458 if ($lr & $td) {
1459 my ($wx, $wy) = ($self->{x}, $self->{y});
803 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1460 my ($ox, $oy) = ($ev->{x}, $ev->{y});
804 my ($bw, $bh) = ($self->{w}, $self->{h}); 1461 my ($bw, $bh) = ($self->{w}, $self->{h});
805 1462
1463 my $mx = $x < $border;
1464 my $my = $y < $border;
1465
806 $self->{motion} = sub { 1466 $self->{motion} = sub {
807 my ($ev, $x, $y) = @_; 1467 my ($ev, $x, $y) = @_;
808 1468
809 ($x, $y) = ($ev->{x}, $ev->{y}); 1469 my $dx = $ev->{x} - $ox;
1470 my $dy = $ev->{y} - $oy;
810 1471
811 $self->{user_w} = $bw + $x - $ox; 1472 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
812 $self->{user_h} = $bh + $y - $oy; 1473 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
813 $self->check_size; 1474
1475 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1476 $self->realloc;
814 }; 1477 };
815 1478
816 } elsif ($x >= 0 && $x < $self->{w} 1479 } elsif ($lr ^ $td) {
817 && $y >= 0 && $y < $border) {
818
819 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1480 my ($ox, $oy) = ($ev->{x}, $ev->{y});
820 my ($bx, $by) = ($self->{x}, $self->{y}); 1481 my ($bx, $by) = ($self->{x}, $self->{y});
821 1482
822 $self->{motion} = sub { 1483 $self->{motion} = sub {
823 my ($ev, $x, $y) = @_; 1484 my ($ev, $x, $y) = @_;
824 1485
825 ($x, $y) = ($ev->{x}, $ev->{y}); 1486 ($x, $y) = ($ev->{x}, $ev->{y});
826 1487
827 $self->move ($bx + $x - $ox, $by + $y - $oy); 1488 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
828 $self->update; 1489 # HACK: the next line is required to enforce placement
1490 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
829 }; 1491 };
1492 } else {
1493 return 0;
1494 }
1495
830 } 1496 1
831} 1497}
832 1498
833sub button_up { 1499sub invoke_button_up {
834 my ($self, $ev, $x, $y) = @_; 1500 my ($self, $ev, $x, $y) = @_;
835 1501
836 delete $self->{motion}; 1502 ! ! delete $self->{motion}
837} 1503}
838 1504
839sub mouse_motion { 1505sub invoke_mouse_motion {
840 my ($self, $ev, $x, $y) = @_; 1506 my ($self, $ev, $x, $y) = @_;
841 1507
842 $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
843} 1519}
844 1520
845sub _draw { 1521sub _draw {
846 my ($self) = @_; 1522 my ($self) = @_;
847 1523
1524 my $child = $self->{children}[0];
1525
848 my ($w, $h ) = ($self->{w}, $self->{h}); 1526 my ($w, $h ) = ($self->{w}, $self->{h});
849 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1527 my ($cw, $ch) = ($child->{w}, $child->{h});
850 1528
851 glEnable GL_BLEND;
852 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
853 glEnable GL_TEXTURE_2D; 1529 glEnable GL_TEXTURE_2D;
854 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1530 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
855 1531
856 my $border = $self->border; 1532 my $border = $self->border;
857 1533
858 glColor @{ $self->{border_bg} }; 1534 glColor @{ $self->{border_bg} };
859 $tex[1]->draw_quad (0, 0, $w, $border); 1535 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
860 $tex[3]->draw_quad (0, $border, $border, $ch); 1536 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
861 $tex[2]->draw_quad ($w - $border, $border, $border, $ch); 1537 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
862 $tex[4]->draw_quad (0, $h - $border, $w, $border); 1538 $border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
863 1539
864 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);
865 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
866 # TODO: repeat texture not scale 1557 # TODO: repeat texture not scale
867 my $rep_x = $cw / $bg->{w}; 1558 # solve this better(?)
868 my $rep_y = $ch / $bg->{h}; 1559 $bg->{s} = $cw / $bg->{w};
869 1560 $bg->{t} = $ch / $bg->{h};
870 glColor @{ $self->{bg} };
871
872 $bg->{s} = $rep_x;
873 $bg->{t} = $rep_y;
874 $bg->{wrap_mode} = 1;
875 $bg->draw_quad ($border, $border, $cw, $ch); 1561 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1562 }
876 1563
877 glDisable GL_TEXTURE_2D; 1564 glDisable GL_TEXTURE_2D;
878 glDisable GL_BLEND;
879 1565
880 $self->{title}->draw if $self->{title};
881 $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};
882} 1577}
883 1578
884############################################################################# 1579#############################################################################
885 1580
886package CFClient::UI::Table; 1581package CFPlus::UI::Table;
887 1582
888our @ISA = CFClient::UI::Base::; 1583our @ISA = CFPlus::UI::Container::;
889 1584
890use List::Util qw(max sum); 1585use List::Util qw(max sum);
891 1586
892use CFClient::OpenGL; 1587use CFPlus::OpenGL;
893 1588
894sub new { 1589sub new {
895 my $class = shift; 1590 my $class = shift;
896 1591
897 $class->SUPER::new ( 1592 $class->SUPER::new (
898 col_expand => [], 1593 col_expand => [],
1594 row_expand => [],
899 @_ 1595 @_,
900 ) 1596 )
901} 1597}
902 1598
903sub add { 1599sub add {
904 my ($self, $x, $y, $child) = @_;
905
906 $child->set_parent ($self);
907 $self->{children}[$y][$x] = $child;
908
909 $child->check_size;
910}
911
912# TODO: move to container class maybe? send childs a signal on removal?
913sub clear {
914 my ($self) = @_; 1600 my ($self, @widgets) = @_;
915 1601
916 my $children = delete $self->{children}; 1602 for my $child (@widgets) {
1603 $child->{c_rowspan} ||= 1;
1604 $child->{c_colspan} ||= 1;
917 1605 }
918 for (grep $_, map @$_, grep $_, @$children) {
919 delete $_->{parent};
920 $_->hide;
921 }
922 1606
923 $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);
924} 1625}
925 1626
926sub get_wh { 1627sub get_wh {
927 my ($self) = @_; 1628 my ($self) = @_;
928 1629
929 my (@w, @h); 1630 my (@w, @h);
930 1631
931 for my $y (0 .. $#{$self->{children}}) { 1632 my @children = $self->children;
932 my $row = $self->{children}[$y]
933 or next;
934 1633
935 for my $x (0 .. $#$row) { 1634 # first pass, columns
936 my $widget = $row->[$x] 1635 for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
937 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) {
938 my ($w, $h) = @$widget{qw(req_w req_h)}; 1647 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
939 1648
940 $w[$x] = max $w[$x], $w; 1649 my $sh = sum @h[$r .. $r + $rs - 1];
941 $h[$y] = max $h[$y], $h; 1650
1651 if ($h > $sh) {
1652 $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
942 } 1653 }
943 } 1654 }
944 1655
945 (\@w, \@h) 1656 (\@w, \@h)
946} 1657}
… …
954 (sum @$ws), 1665 (sum @$ws),
955 (sum @$hs), 1666 (sum @$hs),
956 ) 1667 )
957} 1668}
958 1669
959sub size_allocate { 1670sub invoke_size_allocate {
960 my ($self, $w, $h) = @_; 1671 my ($self, $w, $h) = @_;
961 1672
962 my ($ws, $hs) = $self->get_wh; 1673 my ($ws, $hs) = $self->get_wh;
963 1674
964 my $req_w = sum @$ws; 1675 my $req_w = (sum @$ws) || 1;
965 my $req_h = sum @$hs; 1676 my $req_h = (sum @$hs) || 1;
966 1677
967 # TODO: nicer code && do row_expand 1678 # now linearly scale the rows/columns to the allocated size
968 my @col_expand = @{$self->{col_expand}}; 1679 my @col_expand = @{$self->{col_expand}};
969 @col_expand = (1) x @$ws unless @col_expand; 1680 @col_expand = (1) x @$ws unless @col_expand;
970 my $col_expand = (sum @col_expand) || 1; 1681 my $col_expand = (sum @col_expand) || 1;
971 1682
972 # linearly scale sizes
973 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1683 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
974 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
975 1684
976 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
977 CFClient::UI::harmonize $hs; 1693 CFPlus::UI::harmonize $hs;
978 1694
979 my $y; 1695 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
980 1697
981 for my $r (0 .. $#{$self->{children}}) { 1698 for my $widget ($self->children) {
982 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)};
983 or next;
984 1700
985 my $x = 0; 1701 $widget->configure (
986 my $row_h = $hs->[$r]; 1702 $x[$c], $y[$r],
1703 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
987 1704 );
988 for my $c (0 .. $#$row) { 1705 }
989 my $col_w = $ws->[$c];
990 1706
991 if (my $widget = $row->[$c]) { 1707 1
992 $widget->configure ($x, $y, $col_w, $row_h); 1708}
993 }
994 1709
995 $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};
996 } 1737 }
997
998 $y += $row_h;
999 } 1738 }
1000 1739
1001} 1740 my $W = $x2 - $x1;
1741 my $H = $y2 - $y1;
1002 1742
1003sub 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 {
1004 my ($self, $x, $y) = @_; 1761 my ($self, $W, $H) = @_;
1005 1762
1006 $x -= $self->{x}; 1763 for my $child ($self->visible_children) {
1007 $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;
1008 1766
1009 my $res; 1767 $x += $child->{c_halign} * $child->{req_w};
1768 $y += $child->{c_valign} * $child->{req_h};
1010 1769
1011 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1770 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1012 $res = $_->find_widget ($x, $y) 1771 }
1013 and return $res; 1772
1014 } 1773 1
1015
1016 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1017}
1018
1019sub _draw {
1020 my ($self) = @_;
1021
1022 for (grep $_, @{$self->{children}}) {
1023 $_->draw for grep $_, @$_;
1024 }
1025} 1774}
1026 1775
1027############################################################################# 1776#############################################################################
1028 1777
1029package CFClient::UI::HBox; 1778package CFPlus::UI::Box;
1030 1779
1031# TODO: wrap into common Box base class
1032
1033our @ISA = CFClient::UI::Container::; 1780our @ISA = CFPlus::UI::Container::;
1034 1781
1035sub size_request { 1782sub size_request {
1036 my ($self) = @_; 1783 my ($self) = @_;
1037 1784
1038 my @alloc = map [$_->size_request], @{$self->{children}}; 1785 my @children = $self->visible_children;
1039 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 }
1040 ( 1823 }
1041 (List::Util::sum map $_->[0], @alloc), 1824
1042 (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 @_,
1043 ) 1850 )
1044} 1851}
1045 1852
1046sub size_allocate {
1047 my ($self, $w, $h) = @_;
1048
1049 ($h, $w) = ($w, $h);
1050
1051 my $children = $self->{children};
1052
1053 my @h = map $_->{req_w}, @$children;
1054
1055 my $req_h = List::Util::sum @h;
1056
1057 if ($req_h > $h) {
1058 # ah well, not enough space
1059 $_ *= $h / $req_h for @h;
1060 } else {
1061 my $exp = List::Util::sum map $_->{expand}, @$children;
1062 $exp ||= 1;
1063
1064 for (0 .. $#$children) {
1065 my $child = $children->[$_];
1066
1067 my $alloc_h = $h[$_];
1068 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1069 $h[$_] = $alloc_h;
1070 }
1071 }
1072
1073 CFClient::UI::harmonize \@h;
1074
1075 my $y = 0;
1076 for (0 .. $#$children) {
1077 my $child = $children->[$_];
1078 my $h = $h[$_];
1079 $child->configure ($y, 0, $h, $w);
1080
1081 $y += $h;
1082 }
1083
1084 1
1085}
1086
1087############################################################################# 1853#############################################################################
1088 1854
1089package CFClient::UI::VBox; 1855package CFPlus::UI::VBox;
1090 1856
1091# TODO: wrap into common Box base class 1857our @ISA = CFPlus::UI::Box::;
1092 1858
1093our @ISA = CFClient::UI::Container::; 1859sub new {
1860 my $class = shift;
1094 1861
1095sub size_request { 1862 $class->SUPER::new (
1096 my ($self) = @_; 1863 vertical => 1,
1097 1864 @_,
1098 my @alloc = map [$_->size_request], @{$self->{children}};
1099
1100 (
1101 (List::Util::max map $_->[0], @alloc),
1102 (List::Util::sum map $_->[1], @alloc),
1103 ) 1865 )
1104} 1866}
1105 1867
1106sub size_allocate {
1107 my ($self, $w, $h) = @_;
1108
1109 my $children = $self->{children};
1110
1111 my @h = map $_->{req_h}, @$children;
1112
1113 my $req_h = List::Util::sum @h;
1114
1115 if ($req_h > $h) {
1116 # ah well, not enough space
1117 $_ *= $h / $req_h for @h;
1118 } else {
1119 my $exp = List::Util::sum map $_->{expand}, @$children;
1120 $exp ||= 1;
1121
1122 for (0 .. $#$children) {
1123 my $child = $children->[$_];
1124
1125 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1126 }
1127 }
1128
1129 CFClient::UI::harmonize \@h;
1130
1131 my $y = 0;
1132 for (0 .. $#$children) {
1133 my $child = $children->[$_];
1134 my $h = $h[$_];
1135 $child->configure (0, $y, $w, $h);
1136
1137 $y += $h;
1138 }
1139
1140 1
1141}
1142
1143############################################################################# 1868#############################################################################
1144 1869
1145package CFClient::UI::Label; 1870package CFPlus::UI::Label;
1146 1871
1147our @ISA = CFClient::UI::Base::; 1872our @ISA = CFPlus::UI::DrawBG::;
1148 1873
1149use CFClient::OpenGL; 1874use CFPlus::OpenGL;
1150 1875
1151sub new { 1876sub new {
1152 my ($class, %arg) = @_; 1877 my ($class, %arg) = @_;
1153 1878
1154 my $self = $class->SUPER::new ( 1879 my $self = $class->SUPER::new (
1155 fg => [1, 1, 1], 1880 fg => [1, 1, 1],
1881 #bg => none
1882 #active_bg => none
1156 #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),
1157 fontsize => 1, 1890 fontsize => 1,
1158 text => "",
1159 align => -1, 1891 align => -1,
1160 valign => -1, 1892 valign => -1,
1161 padding => 2, 1893 padding_x => 2,
1162 layout => new CFClient::Layout, 1894 padding_y => 2,
1163 can_events => 0, 1895 can_events => 0,
1164 %arg 1896 %arg
1165 ); 1897 );
1166 1898
1167 if (exists $self->{template}) { 1899 if (exists $self->{template}) {
1168 my $layout = new CFClient::Layout; 1900 my $layout = new CFPlus::Layout;
1169 $layout->set_text (delete $self->{template}); 1901 $layout->set_text (delete $self->{template});
1170 $self->{template} = $layout; 1902 $self->{template} = $layout;
1171 } 1903 }
1172 1904
1173 $self->set_text (delete $self->{text}) if exists $self->{text}; 1905 if (exists $self->{markup}) {
1174 $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 }
1175 1910
1176 $self 1911 $self
1177} 1912}
1178 1913
1179sub escape { 1914sub update {
1180 local $_ = $_[1]; 1915 my ($self) = @_;
1181 1916
1182 s/&/&amp;/g; 1917 delete $self->{texture};
1183 s/>/&gt;/g; 1918 $self->SUPER::update;
1184 s/</&lt;/g; 1919}
1185 1920
1186 $_[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 ("");
1187} 1932}
1188 1933
1189sub set_text { 1934sub set_text {
1190 my ($self, $text) = @_; 1935 my ($self, $text) = @_;
1191 1936
1937 return if $self->{text} eq "T$text";
1938 $self->{text} = "T$text";
1939
1192 $self->{layout}->set_text ($text); 1940 $self->{layout}->set_text ($text);
1193 1941
1194 delete $self->{texture}; 1942 delete $self->{size_req};
1195 $self->check_size; 1943 $self->realloc;
1196 $self->update; 1944 $self->update;
1197} 1945}
1198 1946
1199sub set_markup { 1947sub set_markup {
1200 my ($self, $markup) = @_; 1948 my ($self, $markup) = @_;
1201 1949
1950 return if $self->{text} eq "M$markup";
1951 $self->{text} = "M$markup";
1952
1953 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1954
1202 $self->{layout}->set_markup ($markup); 1955 $self->{layout}->set_markup ($markup);
1203 1956
1204 delete $self->{texture}; 1957 delete $self->{size_req};
1205 $self->check_size; 1958 $self->realloc;
1206 $self->update; 1959 $self->update;
1207} 1960}
1208 1961
1209sub size_request { 1962sub size_request {
1210 my ($self) = @_; 1963 my ($self) = @_;
1211 1964
1965 $self->{size_req} ||= do {
1966 my ($max_w, $max_h) = $self->get_max_wh;
1967
1212 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1968 $self->{layout}->set_font ($self->{font}) if $self->{font};
1213 $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});
1214 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1972 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1215 1973
1216 my ($w, $h) = $self->{layout}->size; 1974 my ($w, $h) = $self->{layout}->size;
1217 1975
1218 if (exists $self->{template}) { 1976 if (exists $self->{template}) {
1219 $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);
1220 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 1979 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1221 1980
1222 my ($w2, $h2) = $self->{template}->size; 1981 my ($w2, $h2) = $self->{template}->size;
1223 1982
1224 $w = List::Util::max $w, $w2; 1983 $w = List::Util::max $w, $w2;
1225 $h = List::Util::max $h, $h2; 1984 $h = List::Util::max $h, $h2;
1985 }
1986
1987 [$w, $h]
1226 } 1988 };
1227 1989
1228 ( 1990 @{ $self->{size_req} }
1229 $w + $self->{padding} * 2,
1230 $h + $self->{padding} * 2,
1231 )
1232} 1991}
1233 1992
1993sub baseline_shift {
1994 $_[0]{layout}->descent
1995}
1996
1234sub size_allocate { 1997sub invoke_size_allocate {
1235 my ($self, $w, $h) = @_; 1998 my ($self, $w, $h) = @_;
1236 1999
2000 delete $self->{ox};
2001
1237 delete $self->{texture}; 2002 delete $self->{texture}
2003 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2004
2005 1
1238} 2006}
1239 2007
1240sub set_fontsize { 2008sub set_fontsize {
1241 my ($self, $fontsize) = @_; 2009 my ($self, $fontsize) = @_;
1242 2010
1243 $self->{fontsize} = $fontsize; 2011 $self->{fontsize} = $fontsize;
2012 delete $self->{size_req};
1244 delete $self->{texture}; 2013 delete $self->{texture};
1245 $self->check_size; 2014
1246 $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;
1247} 2025}
1248 2026
1249sub _draw { 2027sub _draw {
1250 my ($self) = @_; 2028 my ($self) = @_;
1251 2029
2030 $self->SUPER::_draw; # draw background, if applicable
2031
1252 my $tex = $self->{texture} ||= do { 2032 my $size = $self->{texture} ||= do {
2033 $self->{layout}->set_foreground (@{$self->{fg}});
1253 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2034 $self->{layout}->set_font ($self->{font}) if $self->{font};
1254 $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});
1255 $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE); 2038 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1256 new_from_layout CFClient::Texture $self->{layout} 2039
2040 [$self->{layout}->size]
1257 }; 2041 };
1258 2042
1259 glEnable GL_BLEND; 2043 unless (exists $self->{ox}) {
1260 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1261 glEnable GL_TEXTURE_2D;
1262 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1263
1264 glColor @{$self->{fg}};
1265
1266 $self->{ox} = int (
1267 $self->{align} < 0 ? $self->{padding} 2044 $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
1268 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding} 2045 : $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}
1269 : ($self->{w} - $tex->{w}) * 0.5 2046 : ($self->{w} - $size->[0]) * 0.5);
1270 );
1271 2047
1272 $self->{oy} = int (
1273 $self->{valign} < 0 ? $self->{padding} 2048 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1274 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding} 2049 : $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1275 : ($self->{h} - $tex->{h}) * 0.5 2050 : ($self->{h} - $size->[1]) * 0.5);
2051
2052 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1276 ); 2053 };
1277 2054
1278 $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};
1279 2063
1280 glDisable GL_TEXTURE_2D; 2064 $self->{layout}->draw;
1281 glDisable GL_BLEND;
1282} 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#}
1283 2074
1284############################################################################# 2075#############################################################################
1285 2076
1286package CFClient::UI::EntryBase; 2077package CFPlus::UI::EntryBase;
1287 2078
1288our @ISA = CFClient::UI::Label::; 2079our @ISA = CFPlus::UI::Label::;
1289 2080
1290use CFClient::OpenGL; 2081use CFPlus::OpenGL;
1291 2082
1292sub new { 2083sub new {
1293 my $class = shift; 2084 my $class = shift;
1294 2085
1295 $class->SUPER::new ( 2086 $class->SUPER::new (
1296 fg => [1, 1, 1], 2087 fg => [1, 1, 1],
1297 bg => [0, 0, 0, 0.2], 2088 bg => [0, 0, 0, 0.2],
2089 outline => [0.6, 0.3, 0.1],
1298 active_bg => [1, 1, 1, 0.5], 2090 active_bg => [0, 0, 1, .2],
1299 active_fg => [0, 0, 0], 2091 active_fg => [1, 1, 1],
2092 active_outline => [1, 1, 0],
1300 can_hover => 1, 2093 can_hover => 1,
1301 can_focus => 1, 2094 can_focus => 1,
1302 valign => 0, 2095 valign => 0,
1303 can_events => 1, 2096 can_events => 1,
2097 ellipsise => 0,
2098 #text => ...
2099 #hidden => "*",
1304 @_ 2100 @_
1305 ) 2101 )
1306} 2102}
1307 2103
1308sub _set_text { 2104sub _set_text {
… …
1310 2106
1311 delete $self->{cur_h}; 2107 delete $self->{cur_h};
1312 2108
1313 return if $self->{text} eq $text; 2109 return if $self->{text} eq $text;
1314 2110
1315 delete $self->{texture};
1316
1317 $self->{last_activity} = $::NOW; 2111 $self->{last_activity} = $::NOW;
1318 $self->{text} = $text; 2112 $self->{text} = $text;
1319 2113
1320 $text =~ s/./*/g if $self->{hidden}; 2114 $text =~ s/./*/g if $self->{hidden};
1321 $self->{layout}->set_text ("$text "); 2115 $self->{layout}->set_text ("$text ");
2116 delete $self->{size_req};
1322 2117
1323 $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);
1324} 2129}
1325 2130
1326sub get_text { 2131sub get_text {
1327 $_[0]{text} 2132 $_[0]{text}
1328} 2133}
… …
1333 my ($w, $h) = $self->SUPER::size_request; 2138 my ($w, $h) = $self->SUPER::size_request;
1334 2139
1335 ($w + 1, $h) # add 1 for cursor 2140 ($w + 1, $h) # add 1 for cursor
1336} 2141}
1337 2142
1338sub size_allocate {
1339 my ($self, $w, $h) = @_;
1340
1341 $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
1342}
1343
1344sub set_text {
1345 my ($self, $text) = @_;
1346
1347 $self->{cursor} = length $text;
1348 $self->_set_text ($text);
1349 $self->update;
1350}
1351
1352sub key_down { 2143sub invoke_key_down {
1353 my ($self, $ev) = @_; 2144 my ($self, $ev) = @_;
1354 2145
1355 my $mod = $ev->{mod}; 2146 my $mod = $ev->{mod};
1356 my $sym = $ev->{sym}; 2147 my $sym = $ev->{sym};
1357 my $uni = $ev->{unicode}; 2148 my $uni = $ev->{unicode};
1358 2149
1359 my $text = $self->get_text; 2150 my $text = $self->get_text;
1360 2151
2152 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2153
1361 if ($sym == 8) { 2154 if ($uni == 8) {
1362 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2155 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1363 } elsif ($sym == 127) { 2156 } elsif ($uni == 127) {
1364 substr $text, $self->{cursor}, 1, ""; 2157 substr $text, $self->{cursor}, 1, "";
1365 } elsif ($sym == CFClient::SDLK_LEFT) { 2158 } elsif ($sym == CFPlus::SDLK_LEFT) {
1366 --$self->{cursor} if $self->{cursor}; 2159 --$self->{cursor} if $self->{cursor};
1367 } elsif ($sym == CFClient::SDLK_RIGHT) { 2160 } elsif ($sym == CFPlus::SDLK_RIGHT) {
1368 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2161 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1369 } 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 = "";
1370 $self->{cursor} = 0; 2176 $self->{cursor} = 0;
1371 } elsif ($sym == CFClient::SDLK_END) {
1372 $self->{cursor} = length $text;
1373 } elsif ($sym == 27) { 2177 } elsif ($uni == 27) {
1374 $self->emit ('escape'); 2178 $self->emit ('escape');
1375 } elsif ($uni) { 2179 } elsif ($uni == 0x0d) {
2180 substr $text, $self->{cursor}++, 0, "\012";
2181 } elsif ($uni >= 0x20) {
1376 substr $text, $self->{cursor}++, 0, chr $uni; 2182 substr $text, $self->{cursor}++, 0, chr $uni;
2183 } else {
2184 return 0;
1377 } 2185 }
1378 2186
1379 $self->_set_text ($text); 2187 $self->_set_text ($text);
2188
2189 $self->realloc;
1380 $self->update; 2190 $self->update;
1381}
1382 2191
2192 1
2193}
2194
1383sub focus_in { 2195sub invoke_focus_in {
1384 my ($self) = @_; 2196 my ($self) = @_;
1385 2197
1386 $self->{last_activity} = $::NOW; 2198 $self->{last_activity} = $::NOW;
1387 2199
1388 $self->SUPER::focus_in; 2200 $self->SUPER::invoke_focus_in
1389} 2201}
1390 2202
1391sub button_down { 2203sub invoke_button_down {
1392 my ($self, $ev, $x, $y) = @_; 2204 my ($self, $ev, $x, $y) = @_;
1393 2205
1394 $self->SUPER::button_down ($ev, $x, $y); 2206 $self->SUPER::invoke_button_down ($ev, $x, $y);
1395 2207
1396 my $idx = $self->{layout}->xy_to_index ($x, $y); 2208 my $idx = $self->{layout}->xy_to_index ($x, $y);
1397 2209
1398 # byte-index to char-index 2210 # byte-index to char-index
1399 my $text = $self->{text}; 2211 my $text = $self->{text};
1400 utf8::encode $text; 2212 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1401 $self->{cursor} = length substr $text, 0, $idx; 2213 $self->{cursor} = length $text;
1402 2214
1403 $self->_set_text ($self->{text}); 2215 $self->_set_text ($self->{text});
1404 $self->update; 2216 $self->update;
2217
2218 1
1405} 2219}
1406 2220
1407sub mouse_motion { 2221sub invoke_mouse_motion {
1408 my ($self, $ev, $x, $y) = @_; 2222 my ($self, $ev, $x, $y) = @_;
1409# 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
1410} 2226}
1411 2227
1412sub _draw { 2228sub _draw {
1413 my ($self) = @_; 2229 my ($self) = @_;
1414 2230
1415 local $self->{fg} = $self->{fg}; 2231 local $self->{fg} = $self->{fg};
1416 2232
1417 if ($FOCUS == $self) { 2233 if ($FOCUS == $self) {
1418 glColor @{$self->{active_bg}}; 2234 glColor_premultiply @{$self->{active_bg}};
1419 $self->{fg} = $self->{active_fg}; 2235 $self->{fg} = $self->{active_fg};
1420 } else { 2236 } else {
1421 glColor @{$self->{bg}}; 2237 glColor_premultiply @{$self->{bg}};
1422 } 2238 }
1423 2239
1424 glEnable GL_BLEND; 2240 glEnable GL_BLEND;
1425 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2241 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1426 glBegin GL_QUADS;
1427 glVertex 0 , 0;
1428 glVertex 0 , $self->{h};
1429 glVertex $self->{w}, $self->{h}; 2242 glRect 0, 0, $self->{w}, $self->{h};
1430 glVertex $self->{w}, 0;
1431 glEnd;
1432 glDisable GL_BLEND; 2243 glDisable GL_BLEND;
1433 2244
1434 $self->SUPER::_draw; 2245 $self->SUPER::_draw;
1435 2246
1436 #TODO: force update every cursor change :( 2247 #TODO: force update every cursor change :(
… …
1438 2249
1439 unless (exists $self->{cur_h}) { 2250 unless (exists $self->{cur_h}) {
1440 my $text = substr $self->{text}, 0, $self->{cursor}; 2251 my $text = substr $self->{text}, 0, $self->{cursor};
1441 utf8::encode $text; 2252 utf8::encode $text;
1442 2253
1443 @$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);
1444 } 2255 }
1445 2256
1446 glColor @{$self->{fg}}; 2257 glColor_premultiply @{$self->{active_fg}};
1447 glBegin GL_LINES; 2258 glBegin GL_LINES;
1448 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2259 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1449 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};
1450 glEnd; 2261 glEnd;
1451 }
1452}
1453 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
1454package CFClient::UI::Entry; 2281package CFPlus::UI::Entry;
1455 2282
1456our @ISA = CFClient::UI::EntryBase::; 2283our @ISA = CFPlus::UI::EntryBase::;
1457 2284
1458use CFClient::OpenGL; 2285use CFPlus::OpenGL;
1459 2286
1460sub key_down { 2287sub invoke_key_down {
1461 my ($self, $ev) = @_; 2288 my ($self, $ev) = @_;
1462 2289
1463 my $sym = $ev->{sym}; 2290 my $sym = $ev->{sym};
1464 2291
1465 if ($sym == 13) { 2292 if ($ev->{uni} == 0x0d || $sym == 13) {
2293 unshift @{$self->{history}},
2294 my $txt = $self->get_text;
2295
2296 $self->{history_pointer} = -1;
2297 $self->{history_saveback} = '';
1466 $self->emit (activate => $self->get_text); 2298 $self->emit (activate => $txt);
1467 $self->update; 2299 $self->update;
1468 2300
2301 } elsif ($sym == CFPlus::SDLK_UP) {
2302 if ($self->{history_pointer} < 0) {
2303 $self->{history_saveback} = $self->get_text;
2304 }
2305 if (@{$self->{history} || []} > 0) {
2306 $self->{history_pointer}++;
2307 if ($self->{history_pointer} >= @{$self->{history} || []}) {
2308 $self->{history_pointer} = @{$self->{history} || []} - 1;
2309 }
2310 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2311 }
2312
2313 } elsif ($sym == CFPlus::SDLK_DOWN) {
2314 $self->{history_pointer}--;
2315 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2316
2317 if ($self->{history_pointer} >= 0) {
2318 $self->set_text ($self->{history}->[$self->{history_pointer}]);
2319 } else {
2320 $self->set_text ($self->{history_saveback});
2321 }
2322
1469 } else { 2323 } else {
1470 $self->SUPER::key_down ($ev); 2324 return $self->SUPER::invoke_key_down ($ev)
2325 }
2326
1471 } 2327 1
1472
1473} 2328}
1474 2329
1475############################################################################# 2330#############################################################################
1476 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
1477package CFClient::UI::Button; 2371package CFPlus::UI::ButtonBin;
1478 2372
1479our @ISA = CFClient::UI::Label::; 2373our @ISA = CFPlus::UI::Bin::;
1480 2374
1481use CFClient::OpenGL; 2375use CFPlus::OpenGL;
1482 2376
1483my @tex = 2377my @tex =
1484 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2378 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1485 qw(b1_button_active.png); 2379 qw(b1_button_inactive.png b1_button_active.png);
1486 2380
1487sub new { 2381sub new {
1488 my $class = shift; 2382 my $class = shift;
1489 2383
1490 $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 (
1491 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,
1492 fg => [1, 1, 1], 2639 fg => [1, 1, 1],
1493 bg => [1, 1, 1, 0.2],
1494 active_fg => [0, 0, 1], 2640 active_fg => [0, 0, 1],
1495 can_hover => 1, 2641 can_hover => 1,
1496 align => 0, 2642 align => 0,
1497 valign => 0, 2643 valign => 0,
1498 can_events => 1, 2644 can_events => 1,
1499 @_ 2645 @_
1500 ) 2646 );
1501} 2647}
1502 2648
1503sub button_up { 2649sub invoke_button_down {
1504 my ($self, $ev, $x, $y) = @_; 2650 my ($self, $ev, $x, $y) = @_;
1505 2651
2652 1
2653}
2654
2655sub invoke_button_up {
2656 my ($self, $ev, $x, $y) = @_;
2657
2658 $self->emit ("activate")
1506 if ($x >= 0 && $x < $self->{w} 2659 if $x >= 0 && $x < $self->{w}
1507 && $y >= 0 && $y < $self->{h}) { 2660 && $y >= 0 && $y < $self->{h};
1508 $self->emit ("activate"); 2661
1509 } 2662 1
1510}
1511
1512sub _draw {
1513 my ($self) = @_;
1514
1515 local $self->{fg} = $self->{fg};
1516
1517 if ($GRAB == $self) {
1518 $self->{fg} = $self->{active_fg};
1519 }
1520
1521 glEnable GL_BLEND;
1522 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1523 glEnable GL_TEXTURE_2D;
1524 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1525 glColor 0, 0, 0, 1;
1526
1527 $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
1528
1529 glDisable GL_TEXTURE_2D;
1530 glDisable GL_BLEND;
1531
1532 $self->SUPER::_draw;
1533} 2663}
1534 2664
1535############################################################################# 2665#############################################################################
1536 2666
1537package CFClient::UI::CheckBox;
1538
1539our @ISA = CFClient::UI::DrawBG::;
1540
1541my @tex =
1542 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1543 qw(c1_checkbox_bg.png c1_checkbox_active.png);
1544
1545use CFClient::OpenGL;
1546
1547sub new {
1548 my $class = shift;
1549
1550 $class->SUPER::new (
1551 padding => 2,
1552 fg => [1, 1, 1],
1553 active_fg => [1, 1, 0],
1554 state => 0,
1555 can_hover => 1,
1556 @_
1557 )
1558}
1559
1560sub size_request {
1561 my ($self) = @_;
1562
1563 ($self->{padding} * 2 + 6) x 2
1564}
1565
1566sub button_down {
1567 my ($self, $ev, $x, $y) = @_;
1568
1569 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1570 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1571 $self->{state} = !$self->{state};
1572 $self->emit (changed => $self->{state});
1573 }
1574}
1575
1576sub _draw {
1577 my ($self) = @_;
1578
1579 $self->SUPER::_draw;
1580
1581 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
1582
1583 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
1584
1585 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1586
1587 glEnable GL_BLEND;
1588 glEnable GL_TEXTURE_2D;
1589 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1590
1591 my $tex = $self->{state} ? $tex[1] : $tex[0];
1592
1593 $tex->draw_quad (0, 0, $s, $s);
1594
1595 glDisable GL_TEXTURE_2D;
1596 glDisable GL_BLEND;
1597}
1598
1599#############################################################################
1600
1601package CFClient::UI::Image; 2667package CFPlus::UI::VGauge;
1602 2668
1603our @ISA = CFClient::UI::Base::; 2669our @ISA = CFPlus::UI::Base::;
1604
1605use CFClient::OpenGL;
1606use Carp qw/confess/;
1607
1608our %loaded_images;
1609
1610sub new {
1611 my $class = shift;
1612
1613 my $self = $class->SUPER::new (can_events => 0, @_);
1614
1615 $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
1616
1617 $loaded_images{$self->{image}} ||=
1618 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
1619
1620 my $tex = $self->{tex} = $loaded_images{$self->{image}};
1621
1622 Scalar::Util::weaken $loaded_images{$self->{image}};
1623
1624 $self->{aspect} = $tex->{w} / $tex->{h};
1625
1626 $self
1627}
1628
1629sub size_request {
1630 my ($self) = @_;
1631
1632 ($self->{tex}->{w}, $self->{tex}->{h})
1633}
1634
1635sub _draw {
1636 my ($self) = @_;
1637
1638 my $tex = $self->{tex};
1639
1640 my ($w, $h) = ($self->{w}, $self->{h});
1641
1642 if ($self->{rot90}) {
1643 glRotate 90, 0, 0, 1;
1644 glTranslate 0, -$self->{w}, 0;
1645
1646 ($w, $h) = ($h, $w);
1647 }
1648
1649 glEnable GL_BLEND;
1650 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1651 glEnable GL_TEXTURE_2D;
1652 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1653
1654 $tex->draw_quad (0, 0, $w, $h);
1655
1656 glDisable GL_BLEND;
1657 glDisable GL_TEXTURE_2D;
1658}
1659
1660#############################################################################
1661
1662package CFClient::UI::VGauge;
1663
1664our @ISA = CFClient::UI::Base::;
1665 2670
1666use List::Util qw(min max); 2671use List::Util qw(min max);
1667 2672
1668use CFClient::OpenGL; 2673use CFPlus::OpenGL;
1669 2674
1670my %tex = ( 2675my %tex = (
1671 food => [ 2676 food => [
1672 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2677 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1673 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2678 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1674 ], 2679 ],
1675 grace => [ 2680 grace => [
1676 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2681 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1677 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/
1678 ], 2683 ],
1679 hp => [ 2684 hp => [
1680 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2685 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1681 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2686 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1682 ], 2687 ],
1683 mana => [ 2688 mana => [
1684 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2689 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1685 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/
1686 ], 2691 ],
1687); 2692);
1688 2693
1689# eg. VGauge->new (gauge => 'food'), default gauge: food 2694# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
1709} 2714}
1710 2715
1711sub set_max { 2716sub set_max {
1712 my ($self, $max) = @_; 2717 my ($self, $max) = @_;
1713 2718
2719 return if $self->{max_val} == $max;
2720
1714 $self->{max_val} = $max; 2721 $self->{max_val} = $max;
2722 $self->update;
1715} 2723}
1716 2724
1717sub set_value { 2725sub set_value {
1718 my ($self, $val, $max) = @_; 2726 my ($self, $val, $max) = @_;
1719 2727
1720 $self->set_max ($max) 2728 $self->set_max ($max)
1721 if defined $max; 2729 if defined $max;
1722 2730
1723 $max = $self->{max_val}; 2731 return if $self->{val} == $val;
2732
1724 $self->{val} = $val; 2733 $self->{val} = $val;
1725
1726 $self->update; 2734 $self->update;
1727} 2735}
1728 2736
1729sub _draw { 2737sub _draw {
1730 my ($self) = @_; 2738 my ($self) = @_;
… …
1746 my $ycut1 = max 0, min 1, $ycut; 2754 my $ycut1 = max 0, min 1, $ycut;
1747 my $ycut2 = max 0, min 1, $ycut - 1; 2755 my $ycut2 = max 0, min 1, $ycut - 1;
1748 2756
1749 my $h1 = $self->{h} * (1 - $ycut1); 2757 my $h1 = $self->{h} * (1 - $ycut1);
1750 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);
1751 2762
1752 glEnable GL_BLEND; 2763 glEnable GL_BLEND;
1753 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;
1754 glEnable GL_TEXTURE_2D; 2766 glEnable GL_TEXTURE_2D;
1755 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2767 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1756 2768
1757 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2769 glBindTexture GL_TEXTURE_2D, $t1->{name};
1758 glBegin GL_QUADS; 2770 glBegin GL_QUADS;
… …
1773 2785
1774 if ($t3) { 2786 if ($t3) {
1775 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2787 glBindTexture GL_TEXTURE_2D, $t3->{name};
1776 glBegin GL_QUADS; 2788 glBegin GL_QUADS;
1777 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2789 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
1778 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2790 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
1779 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2791 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
1780 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2792 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
1781 glEnd; 2793 glEnd;
1782 } 2794 }
1783 2795
1784 glDisable GL_BLEND; 2796 glDisable GL_BLEND;
1785 glDisable GL_TEXTURE_2D; 2797 glDisable GL_TEXTURE_2D;
1786} 2798}
1787 2799
1788############################################################################# 2800#############################################################################
1789 2801
1790package CFClient::UI::Gauge; 2802package CFPlus::UI::Progress;
1791 2803
1792our @ISA = CFClient::UI::VBox::; 2804our @ISA = CFPlus::UI::Label::;
2805
2806use CFPlus::OpenGL;
1793 2807
1794sub new { 2808sub new {
1795 my ($class, %arg) = @_; 2809 my ($class, %arg) = @_;
1796 2810
1797 my $self = $class->SUPER::new ( 2811 my $self = $class->SUPER::new (
1798 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,
1799 can_hover => 1, 2819 can_events => 1,
2820 ellipsise => 1,
2821 label => "%d%%",
1800 %arg, 2822 %arg,
1801 ); 2823 );
1802 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
1803 $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");
1804 $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);
1805 $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");
1806 2957
1807 $self 2958 $self
1808} 2959}
1809 2960
1810sub set_fontsize { 2961sub set_fontsize {
… …
1812 2963
1813 $self->{value}->set_fontsize ($fsize); 2964 $self->{value}->set_fontsize ($fsize);
1814 $self->{max} ->set_fontsize ($fsize); 2965 $self->{max} ->set_fontsize ($fsize);
1815} 2966}
1816 2967
2968sub set_max {
2969 my ($self, $max) = @_;
2970
2971 $self->{gauge}->set_max ($max);
2972 $self->{max}->set_text ($max);
2973}
2974
1817sub set_value { 2975sub set_value {
1818 my ($self, $val, $max) = @_; 2976 my ($self, $val, $max) = @_;
1819 2977
1820 $self->set_max ($max) 2978 $self->set_max ($max)
1821 if defined $max; 2979 if defined $max;
1822 2980
1823 $self->{gauge}->set_value ($val, $max); 2981 $self->{gauge}->set_value ($val, $max);
1824 $self->{value}->set_text ($val); 2982 $self->{value}->set_text ($val);
1825} 2983}
1826 2984
1827sub set_max {
1828 my ($self, $max) = @_;
1829
1830 $self->{gauge}->set_max ($max);
1831 $self->{max}->set_text ($max);
1832}
1833
1834############################################################################# 2985#############################################################################
1835 2986
1836package CFClient::UI::Slider; 2987package CFPlus::UI::Slider;
1837 2988
1838use strict; 2989use strict;
1839 2990
1840use CFClient::OpenGL; 2991use CFPlus::OpenGL;
1841 2992
1842our @ISA = CFClient::UI::DrawBG::; 2993our @ISA = CFPlus::UI::DrawBG::;
1843 2994
1844my @tex = 2995my @tex =
1845 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 2996 map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
1846 qw(s1_slider.png s1_slider_bg.png); 2997 qw(s1_slider.png s1_slider_bg.png);
1847 2998
1848sub new { 2999sub new {
1849 my $class = shift; 3000 my $class = shift;
1850 3001
1851 # range [value, low, high, page] 3002 # range [value, low, high, page, unit]
1852 3003
1853 # TODO: 0-width page 3004 # TODO: 0-width page
1854 # TODO: req_w/h are wrong with vertical 3005 # TODO: req_w/h are wrong with vertical
1855 # TODO: calculations are off 3006 # TODO: calculations are off
1856 my $self = $class->SUPER::new ( 3007 my $self = $class->SUPER::new (
1857 fg => [1, 1, 1], 3008 fg => [1, 1, 1],
1858 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],
1859 range => [0, 0, 100, 10], 3012 range => [0, 0, 100, 10, 0],
1860 req_w => 20, 3013 min_w => $::WIDTH / 80,
1861 req_h => 20, 3014 min_h => $::WIDTH / 80,
1862 vertical => 0, 3015 vertical => 0,
1863 can_hover => 1, 3016 can_hover => 1,
1864 inner_pad => 5, 3017 inner_pad => 0.02,
1865 @_ 3018 @_
1866 ); 3019 );
1867 3020
3021 $self->set_value ($self->{range}[0]);
3022 $self->update;
3023
1868 $self 3024 $self
1869} 3025}
1870 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
1871sub size_request { 3061sub size_request {
1872 my ($self) = @_; 3062 my ($self) = @_;
1873 3063
1874 my $w = $self->{req_w}; 3064 ($self->{req_w}, $self->{req_h})
1875 my $h = $self->{req_h};
1876
1877 $self->{vertical} ? ($h, $w) : ($w, $h)
1878} 3065}
1879 3066
1880sub button_down { 3067sub invoke_button_down {
1881 my ($self, $ev, $x, $y) = @_; 3068 my ($self, $ev, $x, $y) = @_;
1882 3069
1883 $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
1884 $self->mouse_motion ($ev, $x, $y); 3074 $self->invoke_mouse_motion ($ev, $x, $y);
1885}
1886 3075
3076 1
3077}
3078
1887sub mouse_motion { 3079sub invoke_mouse_motion {
1888 my ($self, $ev, $x, $y) = @_; 3080 my ($self, $ev, $x, $y) = @_;
1889 3081
1890 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
1891 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3122 my ($value, $lo, $hi, $page) = @{$self->{range}};
3123 my $range = ($hi - $page - $lo) || 1e-100;
1892 3124
1893 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3125 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;
1894 3126
1895 my $inner_pad_px = $self->_calc_inner_pad_px ($w); 3127 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
1896 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right 3128 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
1897 3129
1898 $x -= $inner_pad_px; # substract the padding 3130 $value = ($value - $lo) / $range;
1899 $x = $x * ($hi - $lo) / $inner_w + $lo; 3131 $value = $value * $self->{scale} + $self->{offset};
1900 $x = $lo if $x < $lo;
1901 $x = $hi - $page if $x > $hi - $page;
1902 $self->{range}[0] = $x;
1903 3132
1904 $self->emit (changed => $x); 3133 $self->{knob_x} = $value - $knob_w * 0.5;
1905 $self->update; 3134 $self->{knob_w} = $knob_w;
1906 } 3135 }
1907}
1908
1909# the inner_* stuff is for generating a padding for the slider handle,
1910# so that the handle doesn't leave the texture. This calculation isn't 100%
1911# correct propably, but it does the job for now
1912sub _calc_inner_pad_px {
1913 my ($self, $w) = @_;
1914 ($w / 100) * $self->{inner_pad} # % to pixels
1915}
1916
1917sub _draw {
1918 my ($self) = @_;
1919 3136
1920 $self->SUPER::_draw (); 3137 $self->SUPER::_draw ();
1921 3138
1922 my ($w, $h) = @$self{qw(w h)}; 3139 glScale $self->{w}, $self->{h};
1923 3140
1924 if ($self->{vertical}) { 3141 if ($self->{vertical}) {
1925 # draw a vertical slider like a rotated horizontal slider 3142 # draw a vertical slider like a rotated horizontal slider
1926 3143
3144 glTranslate 1, 0, 0;
1927 glRotate 90, 0, 0, 1; 3145 glRotate 90, 0, 0, 1;
1928 glTranslate 0, -$self->{w}, 0;
1929
1930 ($w, $h) = ($h, $w);
1931 } 3146 }
1932 3147
1933 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg}; 3148 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1934 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg}; 3149 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1935 3150
1936 my ($value, $lo, $hi, $page) = @{$self->{range}};
1937
1938 $hi = $value + 1 if $lo == $hi;
1939
1940 my $inner_pad_px = $self->_calc_inner_pad_px ($w);
1941 my $inner_w = $w - $inner_pad_px * 2; # * 2 for left & right
1942
1943 $page = int $page * $inner_w / ($hi - $lo);
1944 $value = int +($value - $lo) * $inner_w / ($hi - $lo);
1945
1946 $w -= $page;
1947 $page &= ~1;
1948 glTranslate $page * 0.5, 0, 0;
1949 $page ||= 2;
1950
1951 my $knob_a = $inner_pad_px + ($value - $page * 0.5);
1952 my $knob_b = $inner_pad_px + ($value + $page * 0.5);
1953
1954 glEnable GL_BLEND;
1955 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1956 glEnable GL_TEXTURE_2D; 3151 glEnable GL_TEXTURE_2D;
1957 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3152 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1958 3153
1959 # draw background 3154 # draw background
1960 $tex[1]->draw_quad (0, 0, $w, $h); 3155 $tex[1]->draw_quad_alpha (0, 0, 1, 1);
1961 3156
1962 # draw handle 3157 # draw handle
1963 $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);
1964 3159
1965 glDisable GL_BLEND;
1966 glDisable GL_TEXTURE_2D; 3160 glDisable GL_TEXTURE_2D;
1967} 3161}
1968 3162
1969############################################################################# 3163#############################################################################
1970 3164
1971package CFClient::UI::TextView; 3165package CFPlus::UI::ValSlider;
1972 3166
1973our @ISA = CFClient::UI::HBox::; 3167our @ISA = CFPlus::UI::HBox::;
1974 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
1975use CFClient::OpenGL; 3210use CFPlus::OpenGL;
1976 3211
1977sub new { 3212sub new {
1978 my $class = shift; 3213 my $class = shift;
1979 3214
1980 my $self = $class->SUPER::new ( 3215 my $self = $class->SUPER::new (
1981 fontsize => 1, 3216 fontsize => 1,
1982 can_events => 0, 3217 can_events => 1,
3218 indent => 0,
1983 #font => default_font 3219 #font => default_font
1984 @_, 3220 @_,
1985 3221
1986 layout => (new CFClient::Layout), 3222 layout => (new CFPlus::Layout),
1987 par => [], 3223 par => [],
3224 max_par => 0,
1988 height => 0, 3225 height => 0,
1989 children => [ 3226 children => [
1990 (new CFClient::UI::Empty expand => 1), 3227 (new CFPlus::UI::Empty expand => 1),
1991 (new CFClient::UI::Slider vertical => 1), 3228 (new CFPlus::UI::Slider vertical => 1),
1992 ], 3229 ],
1993 ); 3230 );
1994 3231
1995 $self->{children}[1]->connect (changed => sub { 3232 $self->{children}[1]->connect (changed => sub { $self->update });
1996 $self->update;
1997 });
1998 3233
1999 $self 3234 $self
2000} 3235}
2001 3236
2002sub set_fontsize { 3237sub set_fontsize {
… …
2004 3239
2005 $self->{fontsize} = $fontsize; 3240 $self->{fontsize} = $fontsize;
2006 $self->reflow; 3241 $self->reflow;
2007} 3242}
2008 3243
2009sub 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 {
2010 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) = @_;
2011 3282
2012 my $layout = $self->{layout}; 3283 my $layout = $self->{layout};
2013 3284
3285 $layout->set_font ($self->{font}) if $self->{font};
3286 $layout->set_foreground (@{$para->{fg}});
2014 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3287 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2015 $layout->set_width ($self->{w}); 3288 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
2016 $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}}
2017 3296 );
2018 ($layout->size)[1] 3297
3298 $layout
2019} 3299}
2020 3300
2021sub reflow { 3301sub reflow {
2022 my ($self) = @_; 3302 my ($self) = @_;
2023 3303
2024 $self->{need_reflow}++; 3304 $self->{need_reflow}++;
2025 $self->update; 3305 $self->update;
2026} 3306}
2027 3307
2028sub 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 {
2029 my ($self, $w, $h) = @_; 3322 my ($self, $para) = @_;
2030 3323
2031 $self->SUPER::size_allocate ($w, $h); 3324 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
2032 3325
2033 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3326 $self->{scroll_to} = $para;
2034 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3327 $self->update;
2035 $self->{layout}->set_width ($self->{children}[0]{w}); 3328}
2036 3329
2037 $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]);
2038} 3339}
2039 3340
2040sub add_paragraph { 3341sub add_paragraph {
2041 my ($self, $color, $text) = @_; 3342 my $self = shift;
2042 3343
2043 #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 };
2044 3354
2045 my $height = $self->text_height ($text); 3355 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3356 push @{$self->{par}}, $para;
3357 }
2046 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
2047 $self->{height} += $height; 3396 $self->{height} = $height;
3397 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2048 3398
2049 push @{$self->{par}}, [$height, $color, $text]; 3399 delete $self->{texture};
3400 }
2050 3401
2051 $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}]; 3402 if (my $paridx = delete $self->{scroll_to}) {
2052 $self->{children}[1]->update; 3403 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3404 }
2053} 3405}
2054 3406
2055sub update { 3407sub update {
2056 my ($self) = @_; 3408 my ($self) = @_;
2057 3409
… …
2059 3411
2060 return unless $self->{h} > 0; 3412 return unless $self->{h} > 0;
2061 3413
2062 delete $self->{texture}; 3414 delete $self->{texture};
2063 3415
2064 $ROOT->on_refresh ($self, sub { 3416 $ROOT->on_post_alloc ($self => sub {
2065 if (delete $self->{need_reflow}) { 3417 $self->force_uptodate;
2066 my $height = 0;
2067 3418
2068 $height += $_->[0] = $self->text_height ($_->[2]) 3419 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2069 for @{$self->{par}};
2070 3420
2071 $self->{height} = $height;
2072
2073 $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
2074
2075 delete $self->{texture};
2076 }
2077
2078 $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub { 3421 $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2079 glClearColor 0, 0, 0, 1; 3422 glClearColor 0, 0, 0, 0;
2080 glClear GL_COLOR_BUFFER_BIT; 3423 glClear GL_COLOR_BUFFER_BIT;
2081 3424
2082 glEnable GL_BLEND; 3425 package CFPlus::UI::Base;
2083 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 3426 local ($draw_x, $draw_y, $draw_w, $draw_h) =
2084 glEnable GL_TEXTURE_2D; 3427 (0, 0, $self->{w}, $self->{h});
2085 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2086 3428
2087 my $top = int $self->{children}[1]{range}[0]; 3429 my $top = int $self->{children}[1]{range}[0];
2088 3430
3431 my $paridx = 0;
3432 my $top_paragraph;
3433 my $top = int $self->{children}[1]{range}[0];
3434
2089 my $y0 = $top; 3435 my $y0 = $top;
2090 my $y1 = $top + $self->{h}; 3436 my $y1 = $top + $H;
2091 3437
2092 my $y = 0;
2093
2094 my $layout = $self->{layout};
2095
2096 $layout->set_font ($self->{font}) if $self->{font};
2097
2098 for my $par (@{$self->{par}}) { 3438 for my $para (@{$self->{par}}) {
2099 my $h = $par->[0]; 3439 my $h = $para->{h};
3440 my $y = $para->{y};
2100 3441
2101 if ($y0 < $y + $h && $y < $y1) { 3442 if ($y0 < $y + $h && $y < $y1) {
2102 $layout->set_text ($par->[2]); 3443 my $layout = $self->get_layout ($para);
2103 3444
2104 glColor @{ $par->[1] }; 3445 $layout->render ($para->{indent}, $y - $y0);
2105 my ($W, $H) = $layout->size; 3446 $layout->draw;
2106 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 }
2107 } 3460 }
2108 3461
2109 $y += $h; 3462 $paridx++;
3463 $top_paragraph ||= $paridx if $y >= $top;
2110 } 3464 }
2111 3465
2112 glDisable GL_TEXTURE_2D; 3466 $self->{top_paragraph} = $top_paragraph;
2113 glDisable GL_BLEND;
2114 }; 3467 };
2115 }); 3468 });
2116} 3469}
2117 3470
3471sub reconfigure {
3472 my ($self) = @_;
3473
3474 $self->SUPER::reconfigure;
3475
3476 $_->{w} = 1e10 for @{ $self->{par} };
3477 $self->reflow;
3478}
3479
2118sub _draw { 3480sub _draw {
2119 my ($self) = @_; 3481 my ($self) = @_;
2120 3482
2121 if ($self->{texture}) {
2122 glEnable GL_TEXTURE_2D; 3483 glEnable GL_TEXTURE_2D;
2123 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3484 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2124 $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});
2125 glDisable GL_TEXTURE_2D; 3487 glDisable GL_TEXTURE_2D;
2126 }
2127 3488
2128 $self->{children}[1]->draw; 3489 $self->{children}[1]->draw;
2129
2130} 3490}
2131 3491
2132############################################################################# 3492#############################################################################
2133 3493
2134package CFClient::UI::Animator; 3494package CFPlus::UI::Animator;
2135 3495
2136use CFClient::OpenGL; 3496use CFPlus::OpenGL;
2137 3497
2138our @ISA = CFClient::UI::Bin::; 3498our @ISA = CFPlus::UI::Bin::;
2139 3499
2140sub moveto { 3500sub moveto {
2141 my ($self, $x, $y) = @_; 3501 my ($self, $x, $y) = @_;
2142 3502
2143 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3503 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2171 glPopMatrix; 3531 glPopMatrix;
2172} 3532}
2173 3533
2174############################################################################# 3534#############################################################################
2175 3535
2176package CFClient::UI::Flopper; 3536package CFPlus::UI::Flopper;
2177 3537
2178our @ISA = CFClient::UI::Button::; 3538our @ISA = CFPlus::UI::Button::;
2179 3539
2180sub new { 3540sub new {
2181 my $class = shift; 3541 my $class = shift;
2182 3542
2183 my $self = $class->SUPER::new ( 3543 my $self = $class->SUPER::new (
2184 state => 0, 3544 state => 0,
2185 connect_activate => \&toggle_flopper, 3545 on_activate => \&toggle_flopper,
2186 @_ 3546 @_
2187 ); 3547 );
2188 3548
2189 if ($self->{state}) {
2190 $self->{state} = 0;
2191 $self->toggle_flopper;
2192 }
2193
2194 $self 3549 $self
2195} 3550}
2196 3551
2197sub toggle_flopper { 3552sub toggle_flopper {
2198 my ($self) = @_; 3553 my ($self) = @_;
2199 3554
2200 # TODO: use animation 3555 $self->{other}->toggle_visibility;
2201 if ($self->{state} = !$self->{state}) {
2202 $CFClient::UI::ROOT->add ($self->{other});
2203 $self->{other}->move ($self->coord2global (0, $self->{h}));
2204 $self->emit ("open");
2205 } else {
2206 $CFClient::UI::ROOT->remove ($self->{other});
2207 $self->emit ("close");
2208 }
2209
2210 $self->emit (changed => $self->{state});
2211} 3556}
2212 3557
2213############################################################################# 3558#############################################################################
2214 3559
2215package CFClient::UI::Tooltip; 3560package CFPlus::UI::Tooltip;
2216 3561
2217our @ISA = CFClient::UI::Bin::; 3562our @ISA = CFPlus::UI::Bin::;
2218 3563
2219use CFClient::OpenGL; 3564use CFPlus::OpenGL;
2220 3565
2221sub new { 3566sub new {
2222 my $class = shift; 3567 my $class = shift;
2223 3568
2224 $class->SUPER::new ( 3569 $class->SUPER::new (
2225 @_, 3570 @_,
2226 can_events => 0, 3571 can_events => 0,
2227 ) 3572 )
2228} 3573}
2229 3574
2230sub set_markup { 3575sub set_tooltip_from {
2231 my ($self, $text) = @_; 3576 my ($self, $widget) = @_;
2232 3577
2233 $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0]; 3578 my $tip = $widget->{tooltip};
2234 $self->{label}->set_markup ($text); 3579 $tip = $tip->($widget) if "CODE" eq ref $tip;
2235 $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 );
2236} 3602}
2237 3603
2238sub size_request { 3604sub size_request {
2239 my ($self) = @_; 3605 my ($self) = @_;
2240 3606
2241 $self->child->set_max_size ($::WIDTH * 0.3);
2242
2243 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3607 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2244 3608
2245 ($w + 4, $h + 4) 3609 ($w + 4, $h + 4)
2246} 3610}
2247 3611
2248sub size_allocate { 3612sub invoke_size_allocate {
2249 my ($self, $w, $h) = @_; 3613 my ($self, $w, $h) = @_;
2250 3614
2251 $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 });
2252} 3638}
2253 3639
2254sub _draw { 3640sub _draw {
2255 my ($self) = @_; 3641 my ($self) = @_;
2256 3642
2257 glPushMatrix;
2258 glTranslate 0.375, 0.375;
2259
2260 my ($w, $h) = @$self{qw(w h)}; 3643 my ($w, $h) = @$self{qw(w h)};
2261 3644
2262 glColor 1, 0.8, 0.4; 3645 glColor 1, 0.8, 0.4;
2263 glBegin GL_QUADS; 3646 glRect 0, 0, $w, $h;
2264 glVertex 0 , 0;
2265 glVertex 0 , $h;
2266 glVertex $w, $h;
2267 glVertex $w, 0;
2268 glEnd;
2269 3647
2270 glColor 0, 0, 0; 3648 glColor 0, 0, 0;
2271 glBegin GL_LINE_LOOP; 3649 glRect_lineloop .5, .5, $w + .5, $h + .5;
2272 glVertex 0 , 0;
2273 glVertex 0 , $h;
2274 glVertex $w, $h;
2275 glVertex $w, 0;
2276 glEnd;
2277 3650
2278 glPopMatrix;
2279
2280 glTranslate 2, 2; 3651 glTranslate 2, 2;
3652
2281 $self->SUPER::_draw; 3653 $self->SUPER::_draw;
2282} 3654}
2283 3655
2284############################################################################# 3656#############################################################################
2285 3657
2286package CFClient::UI::Face; 3658package CFPlus::UI::Face;
2287 3659
2288our @ISA = CFClient::UI::Base::; 3660our @ISA = CFPlus::UI::DrawBG::;
2289 3661
2290use CFClient::OpenGL; 3662use CFPlus::OpenGL;
2291 3663
2292sub new { 3664sub new {
2293 my $class = shift; 3665 my $class = shift;
2294 3666
2295 $class->SUPER::new ( 3667 my $self = $class->SUPER::new (
3668 size_w => 32,
3669 size_h => 8,
2296 aspect => 1, 3670 aspect => 1,
3671 can_events => 0,
2297 @_, 3672 @_,
2298 ) 3673 );
3674
3675 if ($self->{anim} && $self->{animspeed}) {
3676 CFPlus::weaken (my $widget = $self);
3677
3678 $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3679 $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3680 $self->{timer} = EV::timer_ns 0, 0, sub {
3681 return unless $::CONN;
3682
3683 my $w = $widget
3684 or return;
3685
3686 ++$w->{frame};
3687 $w->update_face;
3688
3689 # somehow, $widget can go away
3690 $w->update;
3691 $w->update_timer;
3692 };
3693
3694 $self->update_face;
3695 $self->update_timer;
3696 }
3697
3698 $self
3699}
3700
3701sub update_timer {
3702 my ($self) = @_;
3703
3704 return unless $self->{timer};
3705
3706 $self->{timer}->stop;
3707 if ($self->{visible}) {
3708 $self->{timer}->set (
3709 $self->{anim_start}
3710 + $self->{animspeed}
3711 * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
3712 );
3713 $self->{timer}->start;
3714 }
3715}
3716
3717sub update_face {
3718 my ($self) = @_;
3719
3720 if ($::CONN) {
3721 if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3722 if ($anim && @$anim) {
3723 $self->{face} = $anim->[ $self->{frame} % @$anim ];
3724 delete $self->{face_change_cb};
3725
3726 if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3727 unless ($tex->{name} || $tex->{loading}) {
3728 $tex->upload (sub { $self->reconfigure });
3729 }
3730 }
3731 }
3732 }
3733 }
2299} 3734}
2300 3735
2301sub size_request { 3736sub size_request {
2302 (32, 8) 3737 my ($self) = @_;
2303}
2304 3738
3739 if ($::CONN) {
3740 if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3741 if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3742 if ($tex->{name}) {
3743 return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3744 } elsif (!$tex->{loading}) {
3745 $tex->upload (sub { $self->reconfigure });
3746 }
3747 }
3748
3749 $self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3750 }
3751 }
3752
3753 ($self->{size_w} || 8, $self->{size_h} || 8)
3754}
3755
3756sub update {
3757 my ($self) = @_;
3758
3759 return unless $self->{visible};
3760
3761 $self->SUPER::update;
3762}
3763
3764sub invoke_visibility_change {
3765 my ($self) = @_;
3766
3767 $self->update_timer;
3768
3769 0
3770}
3771
2305sub draw { 3772sub _draw {
2306 my ($self) = @_; 3773 my ($self) = @_;
2307 3774
2308 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]]; 3775 $self->SUPER::_draw;
2309 3776
2310 if ($tex) { 3777 if (my $tex = $self->{tex}) {
2311 glEnable GL_BLEND;
2312 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
2313 glEnable GL_TEXTURE_2D; 3778 glEnable GL_TEXTURE_2D;
2314 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3779 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2315 glColor 1, 1, 1, 1; 3780 glColor 0, 0, 0, 1;
2316 $tex->draw_quad (0, 0, $self->{w}, $self->{h}); 3781 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2317 glDisable GL_TEXTURE_2D; 3782 glDisable GL_TEXTURE_2D;
2318 glDisable GL_BLEND;
2319 } 3783 }
3784}
3785
3786sub destroy {
3787 my ($self) = @_;
3788
3789 (delete $self->{timer})->cancel
3790 if $self->{timer};
3791
3792 $self->SUPER::destroy;
2320} 3793}
2321 3794
2322############################################################################# 3795#############################################################################
2323 3796
2324package CFClient::UI::Root; 3797package CFPlus::UI::Buttonbar;
2325 3798
3799our @ISA = CFPlus::UI::HBox::;
3800
3801# TODO: should actually wrap buttons and other goodies.
3802
3803#############################################################################
3804
3805package CFPlus::UI::Menu;
3806
3807our @ISA = CFPlus::UI::Toplevel::;
3808
3809use CFPlus::OpenGL;
3810
3811sub new {
3812 my $class = shift;
3813
3814 my $self = $class->SUPER::new (
3815 items => [],
3816 z => 100,
3817 @_,
3818 );
3819
3820 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
3821
3822 for my $item (@{ $self->{items} }) {
3823 my ($widget, $cb, $tooltip) = @$item;
3824
3825 # handle various types of items, only text for now
3826 if (!ref $widget) {
3827 if ($widget =~ /\t/) {
3828 my ($left, $right) = split /\t/, $widget, 2;
3829
3830 $widget = new CFPlus::UI::HBox
3831 can_hover => 1,
3832 can_events => 1,
3833 tooltip => $tooltip,
3834 children => [
3835 (new CFPlus::UI::Label markup => $left, expand => 1),
3836 (new CFPlus::UI::Label markup => $right, align => +1),
3837 ],
3838 ;
3839
3840 } else {
3841 $widget = new CFPlus::UI::Label
3842 can_hover => 1,
3843 can_events => 1,
3844 markup => $widget,
3845 tooltip => $tooltip;
3846 }
3847 }
3848
3849 $self->{item}{$widget} = $item;
3850
3851 $self->{vbox}->add ($widget);
3852 }
3853
3854 $self
3855}
3856
3857# popup given the event (must be a mouse button down event currently)
3858sub popup {
3859 my ($self, $ev) = @_;
3860
3861 $self->emit ("popdown");
3862
3863 # maybe save $GRAB? must be careful about events...
3864 $GRAB = $self;
3865 $self->{button} = $ev->{button};
3866
3867 $self->show;
3868 $self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
3869}
3870
3871sub invoke_mouse_motion {
3872 my ($self, $ev, $x, $y) = @_;
3873
3874 # TODO: should use vbox->find_widget or so
3875 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
3876 $self->{hover} = $self->{item}{$HOVER};
3877
3878 0
3879}
3880
3881sub invoke_button_up {
3882 my ($self, $ev, $x, $y) = @_;
3883
3884 if ($ev->{button} == $self->{button}) {
3885 undef $GRAB;
3886 $self->hide;
3887
3888 $self->emit ("popdown");
3889 $self->{hover}[1]->() if $self->{hover};
3890 } else {
3891 return 0
3892 }
3893
3894 1
3895}
3896
3897#############################################################################
3898
3899package CFPlus::UI::Multiplexer;
3900
2326our @ISA = CFClient::UI::Container::; 3901our @ISA = CFPlus::UI::Container::;
2327 3902
2328use CFClient::OpenGL; 3903sub new {
3904 my $class = shift;
2329 3905
2330sub check_size { 3906 my $self = $class->SUPER::new (
3907 @_,
3908 );
3909
3910 $self->{current} = $self->{children}[0]
3911 if @{ $self->{children} };
3912
3913 $self
3914}
3915
3916sub add {
2331 my ($self) = @_; 3917 my ($self, @widgets) = @_;
2332 3918
2333 $self->configure (0, 0, $::WIDTH, $::HEIGHT); 3919 $self->SUPER::add (@widgets);
3920
3921 $self->{current} = $self->{children}[0]
3922 if @{ $self->{children} };
3923}
3924
3925sub get_current_page {
3926 my ($self) = @_;
3927
3928 $self->{current}
3929}
3930
3931sub set_current_page {
3932 my ($self, $page_or_widget) = @_;
3933
3934 my $widget = ref $page_or_widget
3935 ? $page_or_widget
3936 : $self->{children}[$page_or_widget];
3937
3938 $self->{current} = $widget;
3939 $self->{current}->configure (0, 0, $self->{w}, $self->{h});
3940
3941 $self->emit (page_changed => $self->{current});
3942
3943 $self->realloc;
3944}
3945
3946sub visible_children {
3947 $_[0]{current}
2334} 3948}
2335 3949
2336sub size_request { 3950sub size_request {
2337 ($::WIDTH, $::HEIGHT) 3951 my ($self) = @_;
2338}
2339 3952
3953 $self->{current}->size_request
3954}
3955
3956sub invoke_size_allocate {
3957 my ($self, $w, $h) = @_;
3958
3959 $self->{current}->configure (0, 0, $w, $h);
3960
3961 1
3962}
3963
3964sub _draw {
3965 my ($self) = @_;
3966
3967 $self->{current}->draw;
3968}
3969
3970#############################################################################
3971
3972package CFPlus::UI::Notebook;
3973
3974use CFPlus::OpenGL;
3975
3976our @ISA = CFPlus::UI::VBox::;
3977
3978sub new {
3979 my $class = shift;
3980
3981 my $self = $class->SUPER::new (
3982 buttonbar => (new CFPlus::UI::Buttonbar),
3983 multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3984 active_outline => [.7, .7, 0.2],
3985 # filter => # will be put between multiplexer and $self
3986 @_,
3987 );
3988
3989 $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3990 $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3991
3992 {
3993 Scalar::Util::weaken (my $wself = $self);
3994
3995 $self->{multiplexer}->connect (c_add => sub {
3996 my ($mplex, $widgets) = @_;
3997
3998 for my $child (@$widgets) {
3999 Scalar::Util::weaken $child;
4000 $child->{c_tab_} ||= do {
4001 my $tab =
4002 (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
4003 ? $child->{c_tab}
4004 : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
4005
4006 $tab->connect (activate => sub {
4007 $wself->set_current_page ($child);
4008 });
4009
4010 $tab
4011 };
4012
4013 $self->{buttonbar}->add ($child->{c_tab_});
4014 }
4015 });
4016
4017 $self->{multiplexer}->connect (c_remove => sub {
4018 my ($mplex, $widgets) = @_;
4019
4020 for my $child (@$widgets) {
4021 $wself->{buttonbar}->remove ($child->{c_tab_});
4022 }
4023 });
4024 }
4025
4026 $self
4027}
4028
4029sub add {
4030 my ($self, @widgets) = @_;
4031
4032 $self->{multiplexer}->add (@widgets)
4033}
4034
4035sub remove {
4036 my ($self, @widgets) = @_;
4037
4038 $self->{multiplexer}->remove (@widgets)
4039}
4040
4041sub pages {
4042 my ($self) = @_;
4043 $self->{multiplexer}->children
4044}
4045
4046sub add_tab {
4047 my ($self, $title, $widget, $tooltip) = @_;
4048
4049 $title = [$title, $tooltip] unless ref $title;
4050 $widget->{c_tab} = $title;
4051
4052 $self->add ($widget);
4053}
4054
4055sub get_current_page {
4056 my ($self) = @_;
4057
4058 $self->{multiplexer}->get_current_page
4059}
4060
4061sub set_current_page {
4062 my ($self, $page) = @_;
4063
4064 $self->{multiplexer}->set_current_page ($page);
4065 $self->emit (page_changed => $self->{multiplexer}{current});
4066}
4067
4068sub _draw {
4069 my ($self) = @_;
4070
4071 $self->SUPER::_draw ();
4072
4073 if (my $cur = $self->{multiplexer}{current}) {
4074 if ($cur = $cur->{c_tab_}) {
4075 glTranslate $self->{buttonbar}{x} + $cur->{x},
4076 $self->{buttonbar}{y} + $cur->{y};
4077 glLineWidth 3;
4078 #glEnable GL_BLEND;
4079 #glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
4080 glColor @{$self->{active_outline}};
4081 glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
4082 glLineWidth 1;
4083 #glDisable GL_BLEND;
4084 }
4085 }
4086}
4087
4088#############################################################################
4089
4090package CFPlus::UI::Selector;
4091
4092use utf8;
4093
4094our @ISA = CFPlus::UI::Button::;
4095
4096sub new {
4097 my $class = shift;
4098
4099 my $self = $class->SUPER::new (
4100 options => [], # [value, title, longdesc], ...
4101 value => undef,
4102 @_,
4103 );
4104
4105 $self->_set_value ($self->{value});
4106
4107 $self
4108}
4109
4110sub invoke_button_down {
4111 my ($self, $ev) = @_;
4112
4113 my @menu_items;
4114
4115 for (@{ $self->{options} }) {
4116 my ($value, $title, $tooltip) = @$_;
4117
4118 push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
4119 }
4120
4121 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
4122}
4123
4124sub _set_value {
4125 my ($self, $value) = @_;
4126
4127 my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
4128 $item ||= $self->{options}[0]
4129 or return;
4130
4131 $self->{value} = $item->[0];
4132 $self->set_markup ("$item->[1] ⇓");
4133# $self->set_tooltip ($item->[2]);
4134}
4135
4136sub set_value {
4137 my ($self, $value) = @_;
4138
4139 return unless $self->{value} ne $value;
4140
4141 $self->_set_value ($value);
4142 $self->emit (changed => $value);
4143}
4144
4145sub set_options {
4146 my ($self, $options) = @_;
4147
4148 $self->{options} = $options;
4149 $self->_set_value ($self->{value});
4150}
4151
4152#############################################################################
4153
4154package CFPlus::UI::Statusbox;
4155
4156our @ISA = CFPlus::UI::VBox::;
4157
4158sub new {
4159 my $class = shift;
4160
4161 my $self = $class->SUPER::new (
4162 fontsize => 0.8,
4163 @_,
4164 );
4165
4166 CFPlus::weaken (my $this = $self);
4167
4168 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4169
4170 $self
4171}
4172
4173sub reorder {
4174 my ($self) = @_;
4175 my $NOW = Time::HiRes::time;
4176
4177 # freeze display when hovering over any label
4178 return if $CFPlus::UI::TOOLTIP->{owner}
4179 && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
4180 values %{ $self->{item} };
4181
4182 while (my ($k, $v) = each %{ $self->{item} }) {
4183 delete $self->{item}{$k} if $v->{timeout} < $NOW;
4184 }
4185
4186 my @widgets;
4187
4188 my @items = sort {
4189 $a->{pri} <=> $b->{pri}
4190 or $b->{id} <=> $a->{id}
4191 } values %{ $self->{item} };
4192
4193 my $count = 10 + 1;
4194 for my $item (@items) {
4195 last unless --$count;
4196
4197 my $label = $item->{label} ||= do {
4198 # TODO: doesn't handle markup well (read as: at all)
4199 my $short = $item->{count} > 1
4200 ? "<b>$item->{count} ×</b> $item->{text}"
4201 : $item->{text};
4202
4203 for ($short) {
4204 s/^\s+//;
4205 s/\s+/ /g;
4206 }
4207
4208 new CFPlus::UI::Label
4209 markup => $short,
4210 tooltip => $item->{tooltip},
4211 tooltip_font => $::FONT_PROP,
4212 tooltip_width => 0.67,
4213 fontsize => $item->{fontsize} || $self->{fontsize},
4214 max_w => $::WIDTH * 0.44,
4215 fg => [@{ $item->{fg} }],
4216 can_events => 1,
4217 can_hover => 1
4218 };
4219
4220 if ((my $diff = $item->{timeout} - $NOW) < 2) {
4221 $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4222 $label->update;
4223 $label->set_max_size (undef, $label->{req_h} * $diff)
4224 if $diff < 1;
4225 $self->{timer}->set (1/30, 1/30);
4226 } else {
4227 $label->{fg}[3] = $item->{fg}[3] || 1;
4228 }
4229
4230 push @widgets, $label;
4231 }
4232
4233 $self->clear;
4234 $self->SUPER::add (reverse @widgets);
4235}
4236
4237sub add {
4238 my ($self, $text, %arg) = @_;
4239
4240 $text =~ s/^\s+//;
4241 $text =~ s/\s+$//;
4242
4243 return unless $text;
4244
4245 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
4246
4247 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
4248
4249 if (my $item = $self->{item}{$group}) {
4250 if ($item->{text} eq $text) {
4251 $item->{count}++;
4252 } else {
4253 $item->{count} = 1;
4254 $item->{text} = $item->{tooltip} = $text;
4255 }
4256 $item->{id} += 0.2;#d#
4257 $item->{timeout} = $timeout;
4258 delete $item->{label};
4259 } else {
4260 $self->{item}{$group} = {
4261 id => ++$self->{id},
4262 text => $text,
4263 timeout => $timeout,
4264 tooltip => $text,
4265 fg => [0.8, 0.8, 0.8, 0.8],
4266 pri => 0,
4267 count => 1,
4268 %arg,
4269 };
4270 }
4271
4272 $ROOT->on_refresh (reorder => sub {
4273 $self->reorder;
4274 });
4275}
4276
2340sub configure { 4277sub reconfigure {
4278 my ($self) = @_;
4279
4280 delete $_->{label}
4281 for values %{ $self->{item} || {} };
4282
4283 $self->reorder;
4284 $self->SUPER::reconfigure;
4285}
4286
4287sub destroy {
4288 my ($self) = @_;
4289
4290 $self->{timer}->cancel;
4291
4292 $self->SUPER::destroy;
4293}
4294
4295#############################################################################
4296
4297package CFPlus::UI::Root;
4298
4299our @ISA = CFPlus::UI::Container::;
4300
4301use List::Util qw(min max);
4302
4303use CFPlus::OpenGL;
4304
4305sub new {
4306 my $class = shift;
4307
4308 my $self = $class->SUPER::new (
4309 visible => 1,
4310 @_,
4311 );
4312
4313 CFPlus::weaken ($self->{root} = $self);
4314
4315 $self
4316}
4317
4318sub size_request {
4319 my ($self) = @_;
4320
4321 ($self->{w}, $self->{h})
4322}
4323
4324sub _to_pixel {
4325 my ($coord, $size, $max) = @_;
4326
4327 $coord =
4328 $coord eq "center" ? ($max - $size) * 0.5
4329 : $coord eq "max" ? $max
4330 : $coord;
4331
4332 $coord = 0 if $coord < 0;
4333 $coord = $max - $size if $coord > $max - $size;
4334
4335 int $coord + 0.5
4336}
4337
4338sub invoke_size_allocate {
2341 my ($self, $x, $y, $w, $h) = @_; 4339 my ($self, $w, $h) = @_;
2342 4340
2343 $self->SUPER::configure ($x, $y, $w, $h);
2344
2345 for my $child (@{$self->{children}}) { 4341 for my $child ($self->children) {
2346 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 4342 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
2347 4343
2348 $X = List::Util::max 0, List::Util::min $w - $W, $X; 4344 $X = $child->{force_x} if exists $child->{force_x};
2349 $Y = List::Util::max 0, List::Util::min $h - $H, $Y; 4345 $Y = $child->{force_y} if exists $child->{force_y};
4346
4347 $X = _to_pixel $X, $W, $self->{w};
4348 $Y = _to_pixel $Y, $H, $self->{h};
4349
2350 $child->configure ($X, $Y, $W,$H); 4350 $child->configure ($X, $Y, $W, $H);
4351 }
4352
2351 } 4353 1
2352} 4354}
2353 4355
2354sub _topleft { 4356sub coord2local {
2355 my ($self, $x, $y) = @_; 4357 my ($self, $x, $y) = @_;
2356 4358
2357 ($x, $y) 4359 ($x, $y)
2358} 4360}
2359 4361
4362sub coord2global {
4363 my ($self, $x, $y) = @_;
4364
4365 ($x, $y)
4366}
4367
2360sub update { 4368sub update {
2361 my ($self) = @_; 4369 my ($self) = @_;
2362 4370
2363 $self->check_size; 4371 $::WANT_REFRESH->start;
2364 ::refresh ();
2365} 4372}
2366 4373
2367sub add { 4374sub add {
2368 my ($self, $child) = @_; 4375 my ($self, @children) = @_;
2369 4376
2370 # integerize window positions 4377 $_->{is_toplevel} = 1
2371 $child->{x} = int $child->{x}; 4378 for @children;
2372 $child->{y} = int $child->{y};
2373 4379
2374 $self->SUPER::add ($child); 4380 $self->SUPER::add (@children);
4381}
4382
4383sub remove {
4384 my ($self, @children) = @_;
4385
4386 $self->SUPER::remove (@children);
4387
4388 delete $self->{is_toplevel}
4389 for @children;
4390
4391 while (@children) {
4392 my $w = pop @children;
4393 push @children, $w->children;
4394 $w->set_invisible;
4395 }
2375} 4396}
2376 4397
2377sub on_refresh { 4398sub on_refresh {
2378 my ($self, $id, $cb) = @_; 4399 my ($self, $id, $cb) = @_;
2379 4400
2380 $self->{refresh_hook}{$id} = $cb; 4401 $self->{refresh_hook}{$id} = $cb;
2381} 4402}
2382 4403
4404sub on_post_alloc {
4405 my ($self, $id, $cb) = @_;
4406
4407 $self->{post_alloc_hook}{$id} = $cb;
4408}
4409
2383sub draw { 4410sub draw {
2384 my ($self) = @_; 4411 my ($self) = @_;
2385 4412
2386 while (my $rcb = delete $self->{refresh_hook}) { 4413 while ($self->{refresh_hook}) {
2387 $_->() for values %$rcb; 4414 $_->()
4415 for values %{delete $self->{refresh_hook}};
4416 }
4417
4418 while ($self->{realloc}) {
4419 my %queue;
4420 my @queue;
4421 my $widget;
4422
4423 outer:
4424 while () {
4425 if (my $realloc = delete $self->{realloc}) {
4426 for $widget (values %$realloc) {
4427 $widget->{visible} or next; # do not resize invisible widgets
4428
4429 $queue{$widget+0}++ and next; # duplicates are common
4430
4431 push @{ $queue[$widget->{visible}] }, $widget;
4432 }
4433 }
4434
4435 while () {
4436 @queue or last outer;
4437
4438 $widget = pop @{ $queue[-1] || [] }
4439 and last;
4440
4441 pop @queue;
4442 }
4443
4444 delete $queue{$widget+0};
4445
4446 my ($w, $h) = $widget->size_request;
4447
4448 $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
4449 $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
4450
4451 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4452 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4453
4454 $w = $widget->{force_w} if exists $widget->{force_w};
4455 $h = $widget->{force_h} if exists $widget->{force_h};
4456
4457 if ($widget->{req_w} != $w || $widget->{req_h} != $h
4458 || delete $widget->{force_realloc}) {
4459 $widget->{req_w} = $w;
4460 $widget->{req_h} = $h;
4461
4462 $self->{size_alloc}{$widget+0} = $widget;
4463
4464 if (my $parent = $widget->{parent}) {
4465 $self->{realloc}{$parent+0} = $parent
4466 unless $queue{$parent+0};
4467
4468 $parent->{force_size_alloc} = 1;
4469 $self->{size_alloc}{$parent+0} = $parent;
4470 }
4471 }
4472
4473 delete $self->{realloc}{$widget+0};
4474 }
4475
4476 while (my $size_alloc = delete $self->{size_alloc}) {
4477 my @queue = sort { $a->{visible} <=> $b->{visible} }
4478 values %$size_alloc;
4479
4480 while () {
4481 my $widget = pop @queue || last;
4482
4483 my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4484
4485 $w = max $widget->{min_w}, $w;
4486 $h = max $widget->{min_h}, $h;
4487
4488# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4489# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4490
4491 $w = min $widget->{max_w}, $w if exists $widget->{max_w};
4492 $h = min $widget->{max_h}, $h if exists $widget->{max_h};
4493
4494 $w = int $w + 0.5;
4495 $h = int $h + 0.5;
4496
4497 if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4498 $widget->{old_w} = $widget->{w};
4499 $widget->{old_h} = $widget->{h};
4500
4501 $widget->{w} = $w;
4502 $widget->{h} = $h;
4503
4504 $widget->emit (size_allocate => $w, $h);
4505 }
4506 }
4507 }
4508 }
4509
4510 while ($self->{post_alloc_hook}) {
4511 $_->()
4512 for values %{delete $self->{post_alloc_hook}};
2388 } 4513 }
2389 4514
2390 glViewport 0, 0, $::WIDTH, $::HEIGHT; 4515 glViewport 0, 0, $::WIDTH, $::HEIGHT;
2391 glClearColor +($::CFG->{fow_intensity}) x 3, 1; 4516 glClearColor +($::CFG->{fow_intensity}) x 3, 1;
2392 glClear GL_COLOR_BUFFER_BIT; 4517 glClear GL_COLOR_BUFFER_BIT;
2393 4518
2394 glMatrixMode GL_PROJECTION; 4519 glMatrixMode GL_PROJECTION;
2395 glLoadIdentity; 4520 glLoadIdentity;
2396 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000; 4521 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
2397 glMatrixMode GL_MODELVIEW; 4522 glMatrixMode GL_MODELVIEW;
2398 glLoadIdentity; 4523 glLoadIdentity;
2399 4524
4525 {
4526 package CFPlus::UI::Base;
4527
4528 local ($draw_x, $draw_y, $draw_w, $draw_h) =
4529 (0, 0, $self->{w}, $self->{h});
4530
2400 $self->_draw; 4531 $self->_draw;
4532 }
2401} 4533}
2402 4534
2403############################################################################# 4535#############################################################################
2404 4536
2405package CFClient::UI; 4537package CFPlus::UI;
2406 4538
2407$ROOT = new CFClient::UI::Root; 4539$ROOT = new CFPlus::UI::Root;
2408$TOOLTIP = new CFClient::UI::Tooltip; 4540$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
2409 4541
24101 45421
2411 4543

Diff Legend

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