ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.167 by elmex, Mon Apr 24 08:44:23 2006 UTC vs.
Revision 1.458 by root, Fri Dec 28 15:05:33 2007 UTC

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

Diff Legend

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