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.199 by root, Fri May 12 15:45:42 2006 UTC vs.
Revision 1.481 by root, Tue Oct 12 05:11:38 2010 UTC

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

Diff Legend

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