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.234 by root, Thu May 25 16:24:44 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
17our %WIDGET; # all widgets, weak-referenced 20our %WIDGET; # all widgets, weak-referenced
18 21
19sub check_tooltip { 22our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
23 $_[0]->stop;
24
20 if (!$GRAB) { 25 if (!$GRAB) {
21 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 26 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
22 if (length $widget->{tooltip}) { 27 if (length $widget->{tooltip}) {
23
24 if ($TOOLTIP->{owner} != $widget) { 28 if ($TOOLTIP->{owner} != $widget) {
29 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
30 $TOOLTIP->hide;
31
25 $TOOLTIP->{owner} = $widget; 32 $TOOLTIP->{owner} = $widget;
33 $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
26 34
27 my $tip = $widget->{tooltip}; 35 return if $ENV{CFPLUS_DEBUG} & 8;
28 36
29 $tip = $tip->($widget) if CODE:: eq ref $tip;
30
31 $TOOLTIP->set_tooltip_from ($widget); 37 $TOOLTIP->set_tooltip_from ($widget);
32 $TOOLTIP->show; 38 $TOOLTIP->show;
33
34 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
35
36 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
37 if $x + $TOOLTIP->{w} > $::WIDTH;
38
39 $TOOLTIP->move ($x, $y);
40 $TOOLTIP->check_size;
41 $TOOLTIP->update;
42 } 39 }
43 40
44 return; 41 return;
45 } 42 }
46 } 43 }
47 } 44 }
48 45
49 $TOOLTIP->hide; 46 $TOOLTIP->hide;
47 $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50 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;
51} 72}
52 73
53# class methods for events 74# class methods for events
54sub feed_sdl_key_down_event { 75sub feed_sdl_key_down_event {
55 $FOCUS->emit (key_down => $_[0]) 76 $FOCUS->emit (key_down => $_[0])
… …
59sub feed_sdl_key_up_event { 80sub feed_sdl_key_up_event {
60 $FOCUS->emit (key_up => $_[0]) 81 $FOCUS->emit (key_up => $_[0])
61 if $FOCUS; 82 if $FOCUS;
62} 83}
63 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 }
96}
97
64sub feed_sdl_button_down_event { 98sub feed_sdl_button_down_event {
65 my ($ev) = @_; 99 my ($ev) = @_;
66 my ($x, $y) = ($ev->{x}, $ev->{y}); 100 my ($x, $y) = ($ev->{x}, $ev->{y});
67 101
68 if (!$BUTTON_STATE) { 102 $BUTTON_STATE |= 1 << ($ev->{button} - 1);
103
104 unless ($GRAB) {
69 my $widget = $ROOT->find_widget ($x, $y); 105 my $widget = $ROOT->find_widget ($x, $y);
70 106
71 $GRAB = $widget; 107 $GRAB = $widget;
72 $GRAB->update if $GRAB; 108 $GRAB->update if $GRAB;
73 109
74 check_tooltip; 110 $TOOLTIP_WATCHER->invoke;
75 } 111 }
76 112
77 $BUTTON_STATE |= 1 << ($ev->{button} - 1); 113 if ($GRAB) {
114 if ($ev->{button} == 4 || $ev->{button} == 5) {
115 # mousewheel
116 my $delta = $ev->{button} * 2 - 9;
117 my $shift = $ev->{mod} & DC::KMOD_SHIFT;
78 118
79 $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y)) 119 $ev->{dx} = $shift ? $delta : 0;
80 if $GRAB; 120 $ev->{dy} = $shift ? 0 : $delta;
121
122 $GRAB->emit (mouse_wheel => $ev);
123 } else {
124 $GRAB->emit (button_down => $ev)
125 }
126 }
81} 127}
82 128
83sub feed_sdl_button_up_event { 129sub feed_sdl_button_up_event {
84 my ($ev) = @_; 130 my ($ev) = @_;
85 my ($x, $y) = ($ev->{x}, $ev->{y});
86 131
87 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 132 my $widget = $GRAB || $ROOT->find_widget ($ev->{x}, $ev->{y});
88 133
89 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1)); 134 $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
90 135
91 $GRAB->emit (button_up => $ev, $GRAB->coord2local ($x, $y)) 136 $GRAB->emit (button_up => $ev)
92 if $GRAB; 137 if $GRAB && $ev->{button} != 4 && $ev->{button} != 5;
93 138
94 if (!$BUTTON_STATE) { 139 unless ($BUTTON_STATE) {
95 my $grab = $GRAB; undef $GRAB; 140 my $grab = $GRAB; undef $GRAB;
96 $grab->update if $grab; 141 $grab->update if $grab;
97 $GRAB->update if $GRAB; 142 $GRAB->update if $GRAB;
98 143
99 check_tooltip; 144 check_hover $widget;
145 $TOOLTIP_WATCHER->invoke;
100 } 146 }
101} 147}
102 148
103sub feed_sdl_motion_event { 149sub feed_sdl_motion_event {
104 my ($ev) = @_; 150 my ($ev) = @_;
105 my ($x, $y) = ($ev->{x}, $ev->{y}); 151 my ($x, $y) = ($ev->{x}, $ev->{y});
106 152
107 my $widget = $GRAB || $ROOT->find_widget ($x, $y); 153 my $widget = $GRAB || $ROOT->find_widget ($x, $y);
108 154
109 if ($widget != $HOVER) { 155 check_hover $widget;
110 my $hover = $HOVER; $HOVER = $widget;
111 156
112 $hover->update if $hover && $hover->{can_hover}; 157 $HOVER->emit (mouse_motion => $ev)
113 $HOVER->update if $HOVER && $HOVER->{can_hover};
114
115 check_tooltip;
116 }
117
118 $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
119 if $HOVER; 158 if $HOVER;
120} 159}
121 160
122# convert position array to integers 161# convert position array to integers
123sub harmonize { 162sub harmonize {
… …
151# call when resolution changes etc. 190# call when resolution changes etc.
152sub rescale_widgets { 191sub rescale_widgets {
153 my ($sx, $sy) = @_; 192 my ($sx, $sy) = @_;
154 193
155 for my $widget (values %WIDGET) { 194 for my $widget (values %WIDGET) {
156 if ($widget->{is_toplevel}) { 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
157 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 199 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
158 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 200 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
159 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 201 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
160 $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
161 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 202 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
162 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 203 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
163 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 204 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
164 $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_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
165 } 209 }
166 } 210 }
167 211
168 reconfigure_widgets; 212 reconfigure_widgets;
169} 213}
170 214
171############################################################################# 215#############################################################################
172 216
217package DC::UI::Event;
218
219sub xy {
220 $_[1]->coord2local ($_[0]{x}, $_[0]{y})
221}
222
223#############################################################################
224
173package CFClient::UI::Base; 225package DC::UI::Base;
174 226
175use strict; 227use common::sense;
176 228
177use CFClient::OpenGL; 229use DC::OpenGL;
178 230
179sub new { 231sub new {
180 my $class = shift; 232 my $class = shift;
181 233
182 my $self = bless { 234 my $self = bless {
183 x => 0, 235 x => "center",
184 y => 0, 236 y => "center",
185 z => 0, 237 z => 0,
238 w => undef,
239 h => undef,
186 can_events => 1, 240 can_events => 1,
187 @_ 241 @_
188 }, $class; 242 }, $class;
189 243
244 DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
245
190 for (keys %$self) { 246 for (keys %$self) {
191 if (/^connect_(.*)$/) { 247 if (/^on_(.*)$/) {
192 $self->connect ($1 => delete $self->{$_}); 248 $self->connect ($1 => delete $self->{$_});
193 } 249 }
194 } 250 }
195 251
196 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self); 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 }
197 263
198 $self 264 $self
199} 265}
200 266
201sub destroy { 267sub destroy {
202 my ($self) = @_; 268 my ($self) = @_;
203 269
204 $self->hide; 270 $self->hide;
271 $self->emit ("destroy");
205 %$self = (); 272 %$self = ();
206} 273}
207 274
275sub TO_JSON {
276 { "\fw" => $_[0]{s_id} }
277}
278
208sub show { 279sub show {
209 my ($self) = @_; 280 my ($self) = @_;
281
210 return if $self->{parent}; 282 return if $self->{parent};
211 283
212 $CFClient::UI::ROOT->add ($self); 284 $DC::UI::ROOT->add ($self);
213} 285}
214 286
215sub show_centered { 287sub set_visible {
216 my ($self) = @_; 288 my ($self) = @_;
289
217 return if $self->{parent}; 290 return if $self->{visible};
218 291
219 $self->show; 292 $self->{parent} && $self->{parent}{root}#d#
293 or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
220 294
221 $CFClient::UI::ROOT->on_post_alloc ( 295 $self->{root} = $self->{parent}{root};
222 "centered $self" => sub { 296 $self->{visible} = $self->{parent}{visible} + 1;
223 $self->move (($::WIDTH - $self->{w}) * 0.5, ($::HEIGHT - $self->{h}) * 0.5); 297
224 }, 298 $self->emit (visibility_change => 1);
225 ); 299
300 $self->realloc if !exists $self->{req_w};
301
302 $_->set_visible for $self->visible_children;
226} 303}
227 304
228sub set_invisible { 305sub set_invisible {
229 my ($self) = @_; 306 my ($self) = @_;
230 307
231 # broken show/hide model 308 return unless $self->{visible};
309
310 $_->set_invisible for $self->children;
232 311
233 delete $self->{visible}; 312 delete $self->{visible};
313 delete $self->{root};
234 314
235 undef $GRAB if $GRAB == $self; 315 undef $GRAB if $GRAB == $self;
236 undef $HOVER if $HOVER == $self; 316 undef $HOVER if $HOVER == $self;
237 317
238 CFClient::UI::check_tooltip 318 $DC::UI::TOOLTIP_WATCHER->invoke
239 if $CFClient::UI::TOOLTIP->{owner} == $self; 319 if $TOOLTIP->{owner} == $self;
240 320
241 $self->focus_out; 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;
242} 340}
243 341
244sub hide { 342sub hide {
245 my ($self) = @_; 343 my ($self) = @_;
246 344
247 $self->set_invisible; 345 $self->set_invisible;
248 346
347 # extra $parent copy for 5.8.8+ bug workaround
348 # (otherwise $_[0] in remove gets freed
349 if (my $parent = $self->{parent}) {
249 $self->{parent}->remove ($self) 350 $parent->remove ($self);
250 if $self->{parent}; 351 }
251} 352}
252 353
253sub move { 354sub move_abs {
254 my ($self, $x, $y, $z) = @_; 355 my ($self, $x, $y, $z) = @_;
255 356
256 $self->{x} = int $x; 357 $self->{x} = List::Util::max 0, List::Util::min $self->{root}{w} - $self->{w}, int $x;
257 $self->{y} = int $y; 358 $self->{y} = List::Util::max 0, List::Util::min $self->{root}{h} - $self->{h}, int $y;
258 $self->{z} = $z if defined $z; 359 $self->{z} = $z if defined $z;
259 360
260 $self->update; 361 $self->update;
261} 362}
262 363
263sub set_size { 364sub set_size {
264 my ($self, $w, $h) = @_; 365 my ($self, $w, $h) = @_;
265 366
266 $self->{user_w} = $w; 367 $self->{force_w} = $w;
267 $self->{user_h} = $h; 368 $self->{force_h} = $h;
268 369
269 $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)
270} 389}
271 390
272sub size_request { 391sub size_request {
273 require Carp; 392 require Carp;
274 Carp::confess "size_request is abstract"; 393 Carp::confess "size_request is abstract";
275} 394}
276 395
396sub baseline_shift {
397 0
398}
399
277sub configure { 400sub configure {
278 my ($self, $x, $y, $w, $h) = @_; 401 my ($self, $x, $y, $w, $h) = @_;
279 402
280 if ($self->{aspect}) { 403 if ($self->{aspect}) {
404 my ($ow, $oh) = ($w, $h);
405
281 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 406 $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
282 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 407 $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
283 408
284 # use alignment to adjust x, y 409 # use alignment to adjust x, y
285 410
286 $x += int +($w - $w2) * 0.5; 411 $x += int 0.5 * ($ow - $w);
287 $y += int +($h - $h2) * 0.5; 412 $y += int 0.5 * ($oh - $h);
288
289 ($w, $h) = ($w2, $h2);
290 } 413 }
291 414
292 if ($self->{x} != $x || $self->{y} != $y) { 415 if ($self->{x} ne $x || $self->{y} ne $y) {
293 $self->{x} = $x; 416 $self->{x} = $x;
294 $self->{y} = $y; 417 $self->{y} = $y;
295 $self->update; 418 $self->update;
296 } 419 }
297 420
298 if ($self->{w} != $w || $self->{h} != $h) { 421 if ($self->{alloc_w} != $w || $self->{alloc_h} != $h) {
299 $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h]; 422 return unless $self->{visible};
300 }
301}
302 423
303sub size_allocate { 424 $self->{alloc_w} = $w;
304 # nothing to be done 425 $self->{alloc_h} = $h;
305}
306 426
307sub reconfigure { 427 $self->{root}{size_alloc}{$self+0} = $self;
308 my ($self) = @_; 428 }
309
310 $self->check_size (1);
311 $self->update;
312} 429}
313 430
314sub children { 431sub children {
432 # nop
433}
434
435sub visible_children {
436 $_[0]->children
315} 437}
316 438
317sub set_max_size { 439sub set_max_size {
318 my ($self, $w, $h) = @_; 440 my ($self, $w, $h) = @_;
319 441
320 delete $self->{max_w}; $self->{max_w} = $w if $w; 442 $self->{max_w} = int $w if defined $w;
321 delete $self->{max_h}; $self->{max_h} = $h if $h; 443 $self->{max_h} = int $h if defined $h;
444
445 $self->realloc;
322} 446}
323 447
324sub set_tooltip { 448sub set_tooltip {
325 my ($self, $tooltip) = @_; 449 my ($self, $tooltip) = @_;
326 450
… …
329 453
330 return if $self->{tooltip} eq $tooltip; 454 return if $self->{tooltip} eq $tooltip;
331 455
332 $self->{tooltip} = $tooltip; 456 $self->{tooltip} = $tooltip;
333 457
334 if ($CFClient::UI::TOOLTIP->{owner} == $self) { 458 if ($DC::UI::TOOLTIP->{owner} == $self) {
335 delete $CFClient::UI::TOOLTIP->{owner}; 459 delete $DC::UI::TOOLTIP->{owner};
336 CFClient::UI::check_tooltip; 460 $DC::UI::TOOLTIP_WATCHER->invoke;
337 } 461 }
338} 462}
339 463
340# translate global coordinates to local coordinate system 464# translate global coordinates to local coordinate system
341sub coord2local { 465sub coord2local {
342 my ($self, $x, $y) = @_; 466 my ($self, $x, $y) = @_;
343 467
468 return (undef, undef) unless $self->{parent};
469
344 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y}) 470 $self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
345} 471}
346 472
347# translate local coordinates to global coordinate system 473# translate local coordinates to global coordinate system
348sub coord2global { 474sub coord2global {
349 my ($self, $x, $y) = @_; 475 my ($self, $x, $y) = @_;
350 476
477 return (undef, undef) unless $self->{parent};
478
351 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y}) 479 $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
352} 480}
353 481
354sub focus_in { 482sub invoke_focus_in {
355 my ($self) = @_; 483 my ($self) = @_;
356 484
357 return if $FOCUS == $self; 485 return if $FOCUS == $self;
358 return unless $self->{can_focus}; 486 return unless $self->{can_focus};
359 487
360 my $focus = $FOCUS; $FOCUS = $self; 488 $FOCUS = $self;
361 489
362 $self->_emit (focus_in => $focus); 490 $self->update;
363 491
364 $focus->update if $focus; 492 0
365 $FOCUS->update;
366} 493}
367 494
368sub focus_out { 495sub invoke_focus_out {
369 my ($self) = @_; 496 my ($self) = @_;
370 497
371 return unless $FOCUS == $self; 498 return unless $FOCUS == $self;
372 499
373 my $focus = $FOCUS; undef $FOCUS; 500 undef $FOCUS;
374 501
375 $self->_emit (focus_out => $focus); 502 $self->update;
376 503
377 $focus->update if $focus; #?
378
379 $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus 504 $::MAPWIDGET->grab_focus #d# focus mapwidget if no other widget has focus
380 unless $FOCUS; 505 unless $FOCUS;
381}
382 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
383sub mouse_motion { } 517sub invoke_mouse_motion { 0 }
384sub button_up { } 518sub invoke_button_up { 0 }
385sub key_down { } 519sub invoke_key_down { 0 }
386sub key_up { } 520sub invoke_key_up { 0 }
521sub invoke_mouse_wheel { 0 }
387 522
388sub button_down { 523sub invoke_button_down {
389 my ($self, $ev, $x, $y) = @_; 524 my ($self, $ev, $x, $y) = @_;
390 525
391 $self->focus_in; 526 $self->grab_focus;
392}
393 527
394sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 528 0
395sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 529}
396sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
397sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
398sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
399 530
400sub 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 {
401 my ($self) = @_; 543 my ($self, $signal) = @_;
402 544
403 return unless $self->{h} && $self->{w}; 545 delete $self->{signal_cb}{$signal};
404
405 glPushMatrix;
406 glTranslate $self->{x}, $self->{y}, 0;
407 $self->_draw;
408 glPopMatrix;
409
410 if ($self == $HOVER && $self->{can_hover}) {
411 my ($x, $y) = @$self{qw(x y)};
412
413 glColor 1, 0.8, 0.5, 0.2;
414 glEnable GL_BLEND;
415 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
416 glBegin GL_QUADS;
417 glVertex $x , $y;
418 glVertex $x + $self->{w}, $y;
419 glVertex $x + $self->{w}, $y + $self->{h};
420 glVertex $x , $y + $self->{h};
421 glEnd;
422 glDisable GL_BLEND;
423 }
424
425 if ($ENV{PCLIENT_DEBUG}) {
426 glPushMatrix;
427 glColor 1, 1, 0, 1;
428 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
429 glBegin GL_LINE_LOOP;
430 glVertex 0 , 0;
431 glVertex $self->{w} - 1, 0;
432 glVertex $self->{w} - 1, $self->{h} - 1;
433 glVertex 0 , $self->{h} - 1;
434 glEnd;
435 glPopMatrix;
436 #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
437 }
438} 546}
439 547
440sub _draw { 548my %has_coords = (
441 my ($self) = @_; 549 button_down => 1,
550 button_up => 1,
551 mouse_motion => 1,
552 mouse_wheel => 1,
553);
442 554
443 warn "no draw defined for $self\n"; 555sub emit {
444} 556 my ($self, $signal, @args) = @_;
445 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
446sub find_widget { 578#sub find_widget {
447 my ($self, $x, $y) = @_; 579# in .xs
448
449 return () unless $self->{can_events};
450
451 return $self
452 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
453 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
454
455 ()
456}
457 580
458sub set_parent { 581sub set_parent {
459 my ($self, $parent) = @_; 582 my ($self, $parent) = @_;
460 583
461 Scalar::Util::weaken ($self->{parent} = $parent); 584 DC::weaken ($self->{parent} = $parent);
462 585 $self->set_visible if $parent->{visible};
463 # TODO: req_w _does_change after ->reconfigure
464 $self->check_size
465 unless exists $self->{req_w};
466
467 $self->show;
468} 586}
469 587
470sub check_size { 588sub realloc {
471 my ($self, $forced) = @_; 589 my ($self) = @_;
472 590
473 $self->{force_alloc} = 1 if $forced; 591 if ($self->{visible}) {
474 $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 }
475} 600}
476 601
477sub update { 602sub update {
478 my ($self) = @_; 603 my ($self) = @_;
479 604
480 $self->{parent}->update 605 $self->{parent}->update
481 if $self->{parent}; 606 if $self->{parent};
482} 607}
483 608
484sub connect { 609sub reconfigure {
485 my ($self, $signal, $cb) = @_; 610 my ($self) = @_;
486 611
487 push @{ $self->{signal_cb}{$signal} }, $cb; 612 $self->realloc;
613 $self->update;
488} 614}
489 615
490sub _emit { 616# using global variables seems a bit hacky, but passing through all drawing
491 my ($self, $signal, @args) = @_; 617# functions seems pointless.
618our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
492 619
493 List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []} 620#sub draw {
494} 621#CFPlus.xs
495 622
496sub emit { 623sub _draw {
497 my ($self, $signal, @args) = @_; 624 my ($self) = @_;
498 625
499 $self->_emit ($signal, @args) 626 warn "no draw defined for $self\n";
500 || $self->$signal (@args);
501} 627}
502 628
503sub DESTROY { 629sub DESTROY {
504 my ($self) = @_; 630 my ($self) = @_;
505 631
632 return if DC::in_destruct;
633
634 local $@;
635 eval { $self->destroy };
636 warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
637
506 delete $WIDGET{$self+0}; 638 delete $WIDGET{$self+0};
507 #$self->deactivate;
508} 639}
509 640
510############################################################################# 641#############################################################################
511 642
512package CFClient::UI::DrawBG; 643package DC::UI::DrawBG;
513 644
514our @ISA = CFClient::UI::Base::; 645our @ISA = DC::UI::Base::;
515 646
516use strict; 647use common::sense;
648
517use CFClient::OpenGL; 649use DC::OpenGL;
518 650
519sub new { 651sub new {
520 my $class = shift; 652 my $class = shift;
521
522 # range [value, low, high, page]
523 653
524 $class->SUPER::new ( 654 $class->SUPER::new (
525 #bg => [0, 0, 0, 0.2], 655 #bg => [0, 0, 0, 0.2],
526 #active_bg => [1, 1, 1, 0.5], 656 #active_bg => [1, 1, 1, 0.5],
527 @_ 657 @_
528 ) 658 )
529} 659}
530 660
661sub set_bg {
662 my ($self, $bg) = @_;
663
664 $self->{bg} = $bg;
665 $self->update;
666}
667
531sub _draw { 668sub _draw {
532 my ($self) = @_; 669 my ($self) = @_;
533 670
534 my $color = $FOCUS == $self && $self->{active_bg} 671 my $color = $FOCUS == $self
535 ? $self->{active_bg} 672 ? $self->{active_bg} || $self->{bg}
536 : $self->{bg}; 673 : $self->{bg};
537 674
538 if ($color && (@$color < 4 || $color->[3])) { 675 if ($color && (@$color < 4 || $color->[3])) {
539 my ($w, $h) = @$self{qw(w h)}; 676 my ($w, $h) = @$self{qw(w h)};
540 677
541 glEnable GL_BLEND; 678 glEnable GL_BLEND;
542 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 679 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
543 glColor @$color; 680 glColor_premultiply @$color;
544
545 glBegin GL_QUADS;
546 glVertex 0 , 0;
547 glVertex 0 , $h;
548 glVertex $w, $h; 681 glRect 0, 0, $w, $h;
549 glVertex $w, 0;
550 glEnd;
551
552 glDisable GL_BLEND; 682 glDisable GL_BLEND;
553 } 683 }
554} 684}
555 685
556############################################################################# 686#############################################################################
557 687
558package CFClient::UI::Empty; 688package DC::UI::Empty;
559 689
560our @ISA = CFClient::UI::Base::; 690our @ISA = DC::UI::Base::;
561 691
562sub new { 692sub new {
563 my ($class, %arg) = @_; 693 my ($class, %arg) = @_;
564 $class->SUPER::new (can_events => 0, %arg); 694 $class->SUPER::new (can_events => 0, %arg);
565} 695}
566 696
567sub size_request { 697sub size_request {
568 (0, 0) 698 my ($self) = @_;
699
700 ($self->{w} + 0, $self->{h} + 0)
569} 701}
570 702
571sub draw { } 703sub draw { }
572 704
573############################################################################# 705#############################################################################
574 706
575package CFClient::UI::Container; 707package DC::UI::Container;
576 708
577our @ISA = CFClient::UI::Base::; 709our @ISA = DC::UI::Base::;
578 710
579sub new { 711sub new {
580 my ($class, %arg) = @_; 712 my ($class, %arg) = @_;
581 713
582 my $children = delete $arg{children} || []; 714 my $children = delete $arg{children};
583 715
584 my $self = $class->SUPER::new ( 716 my $self = $class->SUPER::new (
585 children => [], 717 children => [],
586 can_events => 0, 718 can_events => 0,
587 %arg, 719 %arg,
588 ); 720 );
721
589 $self->add ($_) for @$children; 722 $self->add (@$children)
723 if $children && @$children;
590 724
591 $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;
592} 734}
593 735
594sub add { 736sub add {
595 my ($self, @widgets) = @_; 737 my ($self, @widgets) = @_;
596 738
597 $_->set_parent ($self) 739 $_->set_parent ($self)
598 for @widgets; 740 for @widgets;
599 741
742 # TODO: only do this in widgets that need it, e.g. root, fixed
600 use sort 'stable'; 743 use sort 'stable';
601 744
602 $self->{children} = [ 745 $self->{children} = [
603 sort { $a->{z} <=> $b->{z} } 746 sort { $a->{z} <=> $b->{z} }
604 @{$self->{children}}, @widgets 747 @{$self->{children}}, @widgets
605 ]; 748 ];
606 749
607 $self->check_size (1); 750 $self->realloc;
608 $self->update; 751
752 $self->emit (c_add => \@widgets);
753
754 map $_+0, @widgets
609} 755}
610 756
611sub children { 757sub children {
612 @{ $_[0]{children} } 758 @{ $_[0]{children} }
613} 759}
614 760
615sub remove { 761sub remove {
616 my ($self, $child) = @_; 762 my ($self, @widgets) = @_;
617 763
764 $self->emit (c_remove => \@widgets);
765
766 for my $child (@widgets) {
618 delete $child->{parent}; 767 delete $child->{parent};
619 $child->hide; 768 $child->hide;
620
621 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ]; 769 $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
770 }
622 771
623 $self->check_size; 772 $self->realloc;
624 $self->update;
625} 773}
626 774
627sub clear { 775sub clear {
628 my ($self) = @_; 776 my ($self) = @_;
629 777
630 my $children = delete $self->{children}; 778 my $children = $self->{children};
631 $self->{children} = []; 779 $self->{children} = [];
632 780
633 for (@$children) { 781 for (@$children) {
634 delete $_->{parent}; 782 delete $_->{parent};
635 $_->hide; 783 $_->hide;
636 } 784 }
637 785
638 $self->check_size; 786 $self->realloc;
639 $self->update;
640} 787}
641 788
642sub find_widget { 789sub find_widget {
643 my ($self, $x, $y) = @_; 790 my ($self, $x, $y) = @_;
644 791
645 $x -= $self->{x}; 792 $x -= $self->{x};
646 $y -= $self->{y}; 793 $y -= $self->{y};
647 794
648 my $res; 795 my $res;
649 796
650 for (reverse @{ $self->{children} }) { 797 for (reverse $self->visible_children) {
651 $res = $_->find_widget ($x, $y) 798 $res = $_->find_widget ($x, $y)
652 and return $res; 799 and return $res;
653 } 800 }
654 801
655 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y}) 802 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
656} 803}
657 804
658sub _draw { 805sub _draw {
659 my ($self) = @_; 806 my ($self) = @_;
660 807
661 $_->draw for @{$self->{children}}; 808 $_->draw for $self->visible_children;
662} 809}
663 810
664############################################################################# 811#############################################################################
665 812
666package CFClient::UI::Bin; 813package DC::UI::Bin;
667 814
668our @ISA = CFClient::UI::Container::; 815our @ISA = DC::UI::Container::;
669 816
670sub new { 817sub new {
671 my ($class, %arg) = @_; 818 my ($class, %arg) = @_;
672 819
673 my $child = (delete $arg{child}) || new CFClient::UI::Empty::; 820 my $child = (delete $arg{child}) || new DC::UI::Empty::;
674 821
675 $class->SUPER::new (children => [$child], %arg) 822 $class->SUPER::new (children => [$child], %arg)
676} 823}
677 824
678sub add { 825sub add {
679 my ($self, $child) = @_; 826 my ($self, $child) = @_;
680 827
681 $self->{children} = []; 828 $self->clear;
682
683 $self->SUPER::add ($child); 829 $self->SUPER::add ($child);
684} 830}
685 831
686sub remove { 832sub remove {
687 my ($self, $widget) = @_; 833 my ($self, $widget) = @_;
688 834
689 $self->SUPER::remove ($widget); 835 $self->SUPER::remove ($widget);
690 836
691 $self->{children} = [new CFClient::UI::Empty] 837 $self->{children} = [new DC::UI::Empty]
692 unless @{$self->{children}}; 838 unless @{$self->{children}};
693} 839}
694 840
695sub child { $_[0]->{children}[0] } 841sub child { $_[0]->{children}[0] }
696 842
697sub size_request { 843sub size_request {
698 $_[0]{children}[0]->size_request 844 $_[0]{children}[0]->size_request
699} 845}
700 846
701sub size_allocate { 847sub invoke_size_allocate {
702 my ($self, $w, $h) = @_; 848 my ($self, $w, $h) = @_;
703 849
704 $self->{children}[0]->configure (0, 0, $w, $h); 850 $self->{children}[0]->configure (0, 0, $w, $h);
851
852 1
705} 853}
706 854
707############################################################################# 855#############################################################################
856# back-buffered drawing area
708 857
709package CFClient::UI::Window; 858package DC::UI::Window;
710 859
711our @ISA = CFClient::UI::Bin::; 860our @ISA = DC::UI::Bin::;
712 861
713use CFClient::OpenGL; 862use DC::OpenGL;
714 863
715sub new { 864sub new {
716 my ($class, %arg) = @_; 865 my ($class, %arg) = @_;
717 866
718 my $self = $class->SUPER::new (%arg); 867 my $self = $class->SUPER::new (%arg);
… …
723 872
724 $ROOT->on_post_alloc ($self => sub { $self->render_child }); 873 $ROOT->on_post_alloc ($self => sub { $self->render_child });
725 $self->SUPER::update; 874 $self->SUPER::update;
726} 875}
727 876
728sub size_allocate { 877sub invoke_size_allocate {
729 my ($self, $w, $h) = @_; 878 my ($self, $w, $h) = @_;
730 879
731 $self->SUPER::size_allocate ($w, $h);
732 $self->update; 880 $self->update;
881
882 $self->SUPER::invoke_size_allocate ($w, $h)
733} 883}
734 884
735sub _render { 885sub _render {
886 my ($self) = @_;
887
736 $_[0]{children}[0]->draw; 888 $self->{children}[0]->draw;
737} 889}
738 890
739sub render_child { 891sub render_child {
740 my ($self) = @_; 892 my ($self) = @_;
741 893
742 $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 {
743 glClearColor 0, 0, 0, 0; 895 glClearColor 0, 0, 0, 0;
744 glClear GL_COLOR_BUFFER_BIT; 896 glClear GL_COLOR_BUFFER_BIT;
745 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
746 $self->_render; 904 $self->_render;
905 }
747 }; 906 };
748} 907}
749 908
750sub _draw { 909sub _draw {
751 my ($self) = @_; 910 my ($self) = @_;
752
753 my ($w, $h) = ($self->w, $self->h);
754 911
755 my $tex = $self->{texture} 912 my $tex = $self->{texture}
756 or return; 913 or return;
757 914
758 glEnable GL_TEXTURE_2D; 915 glEnable GL_TEXTURE_2D;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 916 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 glColor 1, 1, 1, 1; 917 glColor 0, 0, 0, 1;
761 918
762 $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h); 919 $tex->draw_quad_alpha_premultiplied (0, 0);
763 920
764 glDisable GL_TEXTURE_2D; 921 glDisable GL_TEXTURE_2D;
765} 922}
766 923
767############################################################################# 924#############################################################################
768 925
769package CFClient::UI::ViewPort; 926package DC::UI::ViewPort;
770 927
928use List::Util qw(min max);
929
771our @ISA = CFClient::UI::Window::; 930our @ISA = DC::UI::Window::;
772 931
773sub new { 932sub new {
774 my $class = shift; 933 my $class = shift;
775 934
776 $class->SUPER::new ( 935 $class->SUPER::new (
… …
781} 940}
782 941
783sub size_request { 942sub size_request {
784 my ($self) = @_; 943 my ($self) = @_;
785 944
786 @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)}; 945 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
787 946
788 @$self{qw(child_w child_h)} 947 $w = 1 if $self->{scroll_x};
789} 948 $h = 1 if $self->{scroll_y};
790 949
950 ($w, $h)
951}
952
791sub size_allocate { 953sub invoke_size_allocate {
792 my ($self, $w, $h) = @_; 954 my ($self, $w, $h) = @_;
793 955
956 my $child = $self->child;
957
794 $w = $self->{child_w} if $self->{scroll_x} && $self->{child_w}; 958 $w = $child->{req_w} if $self->{scroll_x} && $child->{req_w};
795 $h = $self->{child_h} if $self->{scroll_y} && $self->{child_h}; 959 $h = $child->{req_h} if $self->{scroll_y} && $child->{req_h};
796 960
797 $self->child->configure (0, 0, $w, $h); 961 $self->child->configure (0, 0, $w, $h);
798 $self->update; 962 $self->update;
963
964 1
799} 965}
800 966
801sub set_offset { 967sub set_offset {
802 my ($self, $x, $y) = @_; 968 my ($self, $x, $y) = @_;
803 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}) {
804 $self->{view_x} = int $x; 974 $self->{view_x} = $x;
805 $self->{view_y} = int $y; 975 $self->{view_y} = $y;
806 976
977 $self->emit (changed => $x, $y);
807 $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 }
808} 998}
809 999
810# 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
811sub coord2local { 1001sub coord2local {
812 my ($self, $x, $y) = @_; 1002 my ($self, $x, $y) = @_;
… …
827 my ($self, $x, $y) = @_; 1017 my ($self, $x, $y) = @_;
828 1018
829 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w} 1019 if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
830 && $y >= $self->{y} && $y < $self->{y} + $self->{h} 1020 && $y >= $self->{y} && $y < $self->{y} + $self->{h}
831 ) { 1021 ) {
832 $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})
833 } else { 1023 } else {
834 $self->CFClient::UI::Base::find_widget ($x, $y) 1024 $self->DC::UI::Base::find_widget ($x, $y)
835 } 1025 }
836} 1026}
837 1027
838sub _render { 1028sub _render {
839 my ($self) = @_; 1029 my ($self) = @_;
840 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
841 CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y}; 1034 DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
842 1035
843 $self->SUPER::_render; 1036 $self->SUPER::_render;
844} 1037}
845 1038
846############################################################################# 1039#############################################################################
847 1040
848package CFClient::UI::ScrolledWindow; 1041package DC::UI::ScrolledWindow;
849 1042
850our @ISA = CFClient::UI::HBox::; 1043our @ISA = DC::UI::Table::;
851 1044
852sub new { 1045sub new {
853 my $class = shift; 1046 my ($class, %arg) = @_;
1047
1048 my $child = delete $arg{child};
854 1049
855 my $self; 1050 my $self;
856 1051
857 my $slider = new CFClient::UI::Slider 1052 my $hslider = new DC::UI::Slider
1053 c_col => 0,
1054 c_row => 1,
858 vertical => 1, 1055 vertical => 0,
859 range => [0, 0, 1, 0.01], # HACK fix 1056 range => [0, 0, 1, 0.01], # HACK fix
860 connect_changed => sub { 1057 on_changed => sub {
861 $self->{vp}->set_offset (0, $_[1]); 1058 $self->{hpos} = $_[1];
1059 $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
862 }, 1060 },
863 ; 1061 ;
864 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
865 $self = $class->SUPER::new ( 1074 $self = $class->SUPER::new (
866 vp => (new CFClient::UI::ViewPort expand => 1), 1075 scroll_x => 0,
1076 scroll_y => 1,
1077 can_events => 1,
867 slider => $slider, 1078 hslider => $hslider,
868 @_, 1079 vslider => $vslider,
1080 col_expand => [1, 0],
1081 row_expand => [1, 0],
1082 %arg,
869 ); 1083 );
870 1084
871 $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
872 $self->add ($self->{vp}); 1106 $self->SUPER::add ($self->{vp});
873 $self->add ($self->{slider}); 1107
1108 $self->add ($child) if $child;
874 1109
875 $self 1110 $self
876} 1111}
877 1112
1113sub add {
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
878sub size_allocate { 1212sub invoke_size_allocate {
879 my ($self, $w, $h) = @_; 1213 my ($self, $w, $h) = @_;
880 1214
1215 $self->update_slider;
881 $self->SUPER::size_allocate ($w, $h); 1216 $self->SUPER::invoke_size_allocate ($w, $h)
882
883 my $child = $self->{vp}->child;
884 $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $child->{h}, $self->{vp}{h}, 1]);
885} 1217}
886
887#TODO# update range on size_allocate depending on child
888# update viewport offset on scroll
889 1218
890############################################################################# 1219#############################################################################
891 1220
892package CFClient::UI::Frame; 1221package DC::UI::Frame;
893 1222
894our @ISA = CFClient::UI::Bin::; 1223our @ISA = DC::UI::Bin::;
895 1224
896use CFClient::OpenGL; 1225use DC::OpenGL;
897 1226
898sub new { 1227sub new {
899 my $class = shift; 1228 my $class = shift;
900 1229
901 $class->SUPER::new ( 1230 $class->SUPER::new (
… …
909 1238
910 if ($self->{bg}) { 1239 if ($self->{bg}) {
911 my ($w, $h) = @$self{qw(w h)}; 1240 my ($w, $h) = @$self{qw(w h)};
912 1241
913 glEnable GL_BLEND; 1242 glEnable GL_BLEND;
914 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1243 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
915 glColor @{ $self->{bg} }; 1244 glColor_premultiply @{ $self->{bg} };
916
917 glBegin GL_QUADS;
918 glVertex 0 , 0;
919 glVertex 0 , $h;
920 glVertex $w, $h; 1245 glRect 0, 0, $w, $h;
921 glVertex $w, 0;
922 glEnd;
923
924 glDisable GL_BLEND; 1246 glDisable GL_BLEND;
925 } 1247 }
926 1248
927 $self->SUPER::_draw; 1249 $self->SUPER::_draw;
928} 1250}
929 1251
930############################################################################# 1252#############################################################################
931 1253
932package CFClient::UI::FancyFrame; 1254package DC::UI::FancyFrame;
933 1255
934our @ISA = CFClient::UI::Bin::; 1256our @ISA = DC::UI::Bin::;
935 1257
936use CFClient::OpenGL; 1258use DC::OpenGL;
937
938my @tex =
939 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
940 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
941 1259
942sub new { 1260sub new {
943 my $class = shift; 1261 my ($class, %arg) = @_;
944 1262
945 # 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 }
946 1270
947 my $self = $class->SUPER::new ( 1271 my $self = $class->SUPER::new (
948 bg => [1, 1, 1, 1], 1272 # label => "",
949 border_bg => [1, 1, 1, 1], 1273 fg => undef,
950 border => 0.6, 1274 border => 0.8,
951 is_toplevel => 1, 1275 style => 'single',
952 can_events => 1, 1276 %arg,
953 @_
954 ); 1277 );
955 1278
956 $self->{title} &&= new CFClient::UI::Label
957 align => 0,
958 valign => 1,
959 text => $self->{title},
960 fontsize => $self->{border};
961
962 $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};
963} 1287}
964 1288
965sub border { 1289sub border {
966 int $_[0]{border} * $::FONTSIZE 1290 int $_[0]{border} * $::FONTSIZE
967} 1291}
968 1292
969sub size_request { 1293sub size_request {
970 my ($self) = @_; 1294 my ($self) = @_;
1295
1296 ($self->{label_w}, undef) = $self->{label}->size_request
1297 if $self->{label};
971 1298
972 my ($w, $h) = $self->SUPER::size_request; 1299 my ($w, $h) = $self->SUPER::size_request;
973 1300
974 ( 1301 (
975 $w + $self->border * 2, 1302 $w + $self->border * 2,
976 $h + $self->border * 2, 1303 $h + $self->border * 2,
977 ) 1304 )
978} 1305}
979 1306
980sub size_allocate { 1307sub invoke_size_allocate {
981 my ($self, $w, $h) = @_; 1308 my ($self, $w, $h) = @_;
982 1309
983 $h -= List::Util::max 0, $self->border * 2; 1310 my $border = $self->border;
1311
984 $w -= List::Util::max 0, $self->border * 2; 1312 $w -= List::Util::max 0, $border * 2;
1313 $h -= List::Util::max 0, $border * 2;
985 1314
986 $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2) 1315 if (my $label = $self->{label}) {
987 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 }
988 1320
989 $self->child->configure ($self->border, $self->border, $w, $h); 1321 $self->child->configure ($border, $border, $w, $h);
990}
991 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
992sub button_down { 1472sub invoke_button_down {
993 my ($self, $ev, $x, $y) = @_; 1473 my ($self, $ev, $x, $y) = @_;
994 1474
995 my ($w, $h) = @$self{qw(w h)}; 1475 my ($w, $h) = @$self{qw(w h)};
996 my $border = $self->border; 1476 my $border = $self->border;
997 1477
… …
1010 my ($ev, $x, $y) = @_; 1490 my ($ev, $x, $y) = @_;
1011 1491
1012 my $dx = $ev->{x} - $ox; 1492 my $dx = $ev->{x} - $ox;
1013 my $dy = $ev->{y} - $oy; 1493 my $dy = $ev->{y} - $oy;
1014 1494
1015 $self->{user_w} = $bw + $dx * ($mx ? -1 : 1); 1495 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1016 $self->{user_h} = $bh + $dy * ($my ? -1 : 1); 1496 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1497
1017 $self->move ($wx + $dx * $mx, $wy + $dy * $my); 1498 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1018 $self->check_size; 1499 $self->realloc;
1019 }; 1500 };
1020 1501
1021 } elsif ($lr ^ $td) { 1502 } elsif ($lr ^ $td) {
1022 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1503 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1023 my ($bx, $by) = ($self->{x}, $self->{y}); 1504 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1025 $self->{motion} = sub { 1506 $self->{motion} = sub {
1026 my ($ev, $x, $y) = @_; 1507 my ($ev, $x, $y) = @_;
1027 1508
1028 ($x, $y) = ($ev->{x}, $ev->{y}); 1509 ($x, $y) = ($ev->{x}, $ev->{y});
1029 1510
1030 $self->move ($bx + $x - $ox, $by + $y - $oy); 1511 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1031 $self->update; 1512 # HACK: the next line is required to enforce placement
1513 $self->{parent}->invoke_size_allocate ($self->{parent}{w}, $self->{parent}{h});
1032 }; 1514 };
1515 } else {
1516 return 0;
1517 }
1518
1033 } 1519 1
1034} 1520}
1035 1521
1036sub button_up { 1522sub invoke_button_up {
1037 my ($self, $ev, $x, $y) = @_; 1523 my ($self, $ev, $x, $y) = @_;
1038 1524
1039 delete $self->{motion}; 1525 ! ! delete $self->{motion}
1040} 1526}
1041 1527
1042sub mouse_motion { 1528sub invoke_mouse_motion {
1043 my ($self, $ev, $x, $y) = @_; 1529 my ($self, $ev, $x, $y) = @_;
1044 1530
1045 $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
1046} 1542}
1047 1543
1048sub _draw { 1544sub _draw {
1049 my ($self) = @_; 1545 my ($self) = @_;
1050 1546
1547 my $child = $self->{children}[0];
1548
1051 my ($w, $h ) = ($self->{w}, $self->{h}); 1549 my ($w, $h ) = ($self->{w}, $self->{h});
1052 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 1550 my ($cw, $ch) = ($child->{w}, $child->{h});
1053 1551
1054 glEnable GL_TEXTURE_2D; 1552 glEnable GL_TEXTURE_2D;
1055 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1553 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1056 1554
1057 my $border = $self->border; 1555 my $border = $self->border;
1058 1556
1557 if ($border) {
1059 glColor @{ $self->{border_bg} }; 1558 glColor @{ $self->{border_bg} };
1060 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1559 $border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1061 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1560 $border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1062 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1561 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1063 $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 }
1064 1578
1065 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1579 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1066 my $bg = $tex[0]; 1580 glColor @{ $self->{bg} };
1067 1581
1068 # TODO: repeat texture not scale 1582 # TODO: repeat texture not scale
1583 # solve this better(?)
1069 my $rep_x = $cw / $bg->{w}; 1584 $bg->{s} = $cw / $bg->{w};
1070 my $rep_y = $ch / $bg->{h}; 1585 $bg->{t} = $ch / $bg->{h};
1071
1072 glColor @{ $self->{bg} };
1073
1074 $bg->{s} = $rep_x;
1075 $bg->{t} = $rep_y;
1076 $bg->{wrap_mode} = 1;
1077 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1586 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1078 } 1587 }
1079 1588
1080 glDisable GL_TEXTURE_2D; 1589 glDisable GL_TEXTURE_2D;
1081 1590
1082 $self->{title}->draw if $self->{title};
1083
1084 $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};
1085} 1602}
1086 1603
1087############################################################################# 1604#############################################################################
1088 1605
1089package CFClient::UI::Table; 1606package DC::UI::Table;
1090 1607
1091our @ISA = CFClient::UI::Base::; 1608our @ISA = DC::UI::Container::;
1092 1609
1093use List::Util qw(max sum); 1610use List::Util qw(max sum);
1094 1611
1095use CFClient::OpenGL; 1612use DC::OpenGL;
1096 1613
1097sub new { 1614sub new {
1098 my $class = shift; 1615 my $class = shift;
1099 1616
1100 $class->SUPER::new ( 1617 $class->SUPER::new (
1101 col_expand => [], 1618 col_expand => [],
1619 row_expand => [],
1102 @_, 1620 @_,
1103 ) 1621 )
1104} 1622}
1105 1623
1106sub add { 1624sub add {
1107 my ($self, $x, $y, $child) = @_;
1108
1109 $child->set_parent ($self);
1110 $self->{children}[$y][$x] = $child;
1111
1112 $child->check_size;
1113}
1114
1115sub children {
1116 grep $_, map @$_, grep $_, @{ $_[0]{children} }
1117}
1118
1119# TODO: move to container class maybe? send childs a signal on removal?
1120sub clear {
1121 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);
1122 1656
1123 my @children = $self->children; 1657 my @children = $self->children;
1124 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 }
1125 1668 }
1126 for (@children) {
1127 delete $_->{parent};
1128 $_->hide;
1129 }
1130 1669
1131 $self->update; 1670 # second pass, rows
1132} 1671 for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1133
1134sub get_wh {
1135 my ($self) = @_;
1136
1137 my (@w, @h);
1138
1139 for my $y (0 .. $#{$self->{children}}) {
1140 my $row = $self->{children}[$y]
1141 or next;
1142
1143 for my $x (0 .. $#$row) {
1144 my $widget = $row->[$x]
1145 or next;
1146 my ($w, $h) = @$widget{qw(req_w req_h)}; 1672 my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1147 1673
1148 $w[$x] = max $w[$x], $w; 1674 my $sh = sum @h[$r .. $r + $rs - 1];
1149 $h[$y] = max $h[$y], $h; 1675
1676 if ($h > $sh) {
1677 $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1150 } 1678 }
1151 } 1679 }
1152 1680
1153 (\@w, \@h) 1681 (\@w, \@h)
1154} 1682}
… …
1162 (sum @$ws), 1690 (sum @$ws),
1163 (sum @$hs), 1691 (sum @$hs),
1164 ) 1692 )
1165} 1693}
1166 1694
1167sub size_allocate { 1695sub invoke_size_allocate {
1168 my ($self, $w, $h) = @_; 1696 my ($self, $w, $h) = @_;
1169 1697
1170 my ($ws, $hs) = $self->get_wh; 1698 my ($ws, $hs) = $self->get_wh;
1171 1699
1172 my $req_w = sum @$ws; 1700 my $req_w = (sum @$ws) || 1;
1173 my $req_h = sum @$hs; 1701 my $req_h = (sum @$hs) || 1;
1174 1702
1175 # TODO: nicer code && do row_expand 1703 # now linearly scale the rows/columns to the allocated size
1176 my @col_expand = @{$self->{col_expand}}; 1704 my @col_expand = @{$self->{col_expand}};
1177 @col_expand = (1) x @$ws unless @col_expand; 1705 @col_expand = (1) x @$ws unless @col_expand;
1178 my $col_expand = (sum @col_expand) || 1; 1706 my $col_expand = (sum @col_expand) || 1;
1179 1707
1180 # linearly scale sizes
1181 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws; 1708 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1182 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1183 1709
1184 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
1185 CFClient::UI::harmonize $hs; 1718 DC::UI::harmonize $hs;
1186 1719
1187 my $y; 1720 my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1721 my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1188 1722
1189 for my $r (0 .. $#{$self->{children}}) { 1723 for my $widget ($self->children) {
1190 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)};
1191 or next;
1192 1725
1193 my $x = 0; 1726 $widget->configure (
1194 my $row_h = $hs->[$r]; 1727 $x[$c], $y[$r],
1728 $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1195 1729 );
1196 for my $c (0 .. $#$row) { 1730 }
1197 my $col_w = $ws->[$c];
1198 1731
1199 if (my $widget = $row->[$c]) { 1732 1
1200 $widget->configure ($x, $y, $col_w, $row_h); 1733}
1201 }
1202 1734
1203 $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};
1204 } 1762 }
1205
1206 $y += $row_h;
1207 } 1763 }
1208 1764
1209} 1765 my $W = $x2 - $x1;
1766 my $H = $y2 - $y1;
1210 1767
1211sub 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 {
1212 my ($self, $x, $y) = @_; 1786 my ($self, $W, $H) = @_;
1213 1787
1214 $x -= $self->{x}; 1788 for my $child ($self->visible_children) {
1215 $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;
1216 1791
1217 my $res; 1792 $x += $child->{c_halign} * $child->{req_w};
1793 $y += $child->{c_valign} * $child->{req_h};
1218 1794
1219 for (grep $_, map @$_, grep $_, @{ $self->{children} }) { 1795 $child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1220 $res = $_->find_widget ($x, $y) 1796 }
1221 and return $res; 1797
1222 } 1798 1
1223
1224 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1225}
1226
1227sub _draw {
1228 my ($self) = @_;
1229
1230 for (grep $_, @{$self->{children}}) {
1231 $_->draw for grep $_, @$_;
1232 }
1233} 1799}
1234 1800
1235############################################################################# 1801#############################################################################
1236 1802
1237package CFClient::UI::HBox; 1803package DC::UI::Box;
1238 1804
1239# TODO: wrap into common Box base class
1240
1241our @ISA = CFClient::UI::Container::; 1805our @ISA = DC::UI::Container::;
1242 1806
1243sub size_request { 1807sub size_request {
1244 my ($self) = @_; 1808 my ($self) = @_;
1245 1809
1246 my @alloc = map [$_->size_request], @{$self->{children}}; 1810 my @children = $self->visible_children;
1247 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 }
1248 ( 1848 }
1249 (List::Util::sum map $_->[0], @alloc), 1849
1250 (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 @_,
1251 ) 1875 )
1252} 1876}
1253 1877
1254sub size_allocate {
1255 my ($self, $w, $h) = @_;
1256
1257 ($h, $w) = ($w, $h);
1258
1259 my $children = $self->{children};
1260
1261 my @h = map $_->{req_w}, @$children;
1262
1263 my $req_h = List::Util::sum @h;
1264
1265 if ($req_h > $h) {
1266 # ah well, not enough space
1267 $_ *= $h / $req_h for @h;
1268 } else {
1269 my $exp = List::Util::sum map $_->{expand}, @$children;
1270 $exp ||= 1;
1271
1272 for (0 .. $#$children) {
1273 my $child = $children->[$_];
1274
1275 my $alloc_h = $h[$_];
1276 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
1277 $h[$_] = $alloc_h;
1278 }
1279 }
1280
1281 CFClient::UI::harmonize \@h;
1282
1283 my $y = 0;
1284 for (0 .. $#$children) {
1285 my $child = $children->[$_];
1286 my $h = $h[$_];
1287 $child->configure ($y, 0, $h, $w);
1288
1289 $y += $h;
1290 }
1291
1292 1
1293}
1294
1295############################################################################# 1878#############################################################################
1296 1879
1297package CFClient::UI::VBox; 1880package DC::UI::VBox;
1298 1881
1299# TODO: wrap into common Box base class 1882our @ISA = DC::UI::Box::;
1300 1883
1301our @ISA = CFClient::UI::Container::; 1884sub new {
1885 my $class = shift;
1302 1886
1303sub size_request { 1887 $class->SUPER::new (
1304 my ($self) = @_; 1888 vertical => 1,
1305 1889 @_,
1306 my @alloc = map [$_->size_request], @{$self->{children}};
1307
1308 (
1309 (List::Util::max map $_->[0], @alloc),
1310 (List::Util::sum map $_->[1], @alloc),
1311 ) 1890 )
1312} 1891}
1313 1892
1314sub size_allocate {
1315 my ($self, $w, $h) = @_;
1316
1317 Carp::confess "negative size" if $w < 0 || $h < 0;#d#
1318
1319 my $children = $self->{children};
1320
1321 my @h = map $_->{req_h}, @$children;
1322
1323 my $req_h = List::Util::sum @h;
1324
1325 if ($req_h > $h) {
1326 # ah well, not enough space
1327 $_ *= $h / $req_h for @h;
1328 } else {
1329 my $exp = List::Util::sum map $_->{expand}, @$children;
1330 $exp ||= 1;
1331
1332 for (0 .. $#$children) {
1333 my $child = $children->[$_];
1334
1335 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
1336 }
1337 }
1338
1339 CFClient::UI::harmonize \@h;
1340
1341 my $y = 0;
1342 for (0 .. $#$children) {
1343 my $child = $children->[$_];
1344 my $h = $h[$_];
1345 $child->configure (0, $y, $w, $h);
1346
1347 $y += $h;
1348 }
1349
1350 1
1351}
1352
1353############################################################################# 1893#############################################################################
1354 1894
1355package CFClient::UI::Label; 1895package DC::UI::Label;
1356 1896
1357our @ISA = CFClient::UI::DrawBG::; 1897our @ISA = DC::UI::DrawBG::;
1358 1898
1359use CFClient::OpenGL; 1899use DC::OpenGL;
1360 1900
1361sub new { 1901sub new {
1362 my ($class, %arg) = @_; 1902 my ($class, %arg) = @_;
1363 1903
1364 my $self = $class->SUPER::new ( 1904 my $self = $class->SUPER::new (
… …
1367 #active_bg => none 1907 #active_bg => none
1368 #font => default_font 1908 #font => default_font
1369 #text => initial text 1909 #text => initial text
1370 #markup => initial narkup 1910 #markup => initial narkup
1371 #max_w => maximum pixel width 1911 #max_w => maximum pixel width
1912 #style => 0, # render flags
1372 ellipsise => 3, # end 1913 ellipsise => 3, # end
1373 layout => (new CFClient::Layout), 1914 layout => (new DC::Layout),
1374 fontsize => 1, 1915 fontsize => 1,
1375 align => -1, 1916 align => 0.5,
1376 valign => -1, 1917 valign => 0.5,
1918 padding_x => 4,
1377 padding => 2, 1919 padding_y => 2,
1378 can_events => 0, 1920 can_events => 0,
1379 %arg 1921 %arg
1380 ); 1922 );
1381 1923
1382 if (exists $self->{template}) { 1924 if (exists $self->{template}) {
1383 my $layout = new CFClient::Layout; 1925 my $layout = new DC::Layout;
1384 $layout->set_text (delete $self->{template}); 1926 $layout->set_text (delete $self->{template});
1385 $self->{template} = $layout; 1927 $self->{template} = $layout;
1386 } 1928 }
1387 1929
1388 if (exists $self->{markup}) { 1930 if (exists $self->{markup}) {
… …
1392 } 1934 }
1393 1935
1394 $self 1936 $self
1395} 1937}
1396 1938
1397sub escape($) {
1398 local $_ = $_[0];
1399
1400 s/&/&amp;/g;
1401 s/>/&gt;/g;
1402 s/</&lt;/g;
1403
1404 $_
1405}
1406
1407sub update { 1939sub update {
1408 my ($self) = @_; 1940 my ($self) = @_;
1409 1941
1410 delete $self->{texture}; 1942 delete $self->{texture};
1411 $self->SUPER::update; 1943 $self->SUPER::update;
1412} 1944}
1413 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
1414sub set_text { 1959sub set_text {
1415 my ($self, $text) = @_; 1960 my ($self, $text) = @_;
1416 1961
1417 return if $self->{text} eq "T$text"; 1962 return if $self->{text} eq "T$text";
1418 $self->{text} = "T$text"; 1963 $self->{text} = "T$text";
1419 1964
1420 $self->{layout} = new CFClient::Layout if $self->{layout}->is_rgba;
1421 $self->{layout}->set_text ($text); 1965 $self->{layout}->set_text ($text);
1422 1966
1967 delete $self->{size_req};
1968 $self->realloc;
1423 $self->update; 1969 $self->update;
1424 $self->check_size;
1425} 1970}
1426 1971
1427sub set_markup { 1972sub set_markup {
1428 my ($self, $markup) = @_; 1973 my ($self, $markup) = @_;
1429 1974
1430 return if $self->{text} eq "M$markup"; 1975 return if $self->{text} eq "M$markup";
1431 $self->{text} = "M$markup"; 1976 $self->{text} = "M$markup";
1432 1977
1433 my $rgba = $markup =~ /span.*(?:foreground|background)/; 1978 my $rgba = $markup =~ /span.*(?:foreground|background)/;
1434 1979
1435 $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
1436 $self->{layout}->set_markup ($markup); 1980 $self->{layout}->set_markup ($markup);
1437 1981
1982 delete $self->{size_req};
1983 $self->realloc;
1438 $self->update; 1984 $self->update;
1439 $self->check_size;
1440} 1985}
1441 1986
1442sub size_request { 1987sub size_request {
1443 my ($self) = @_; 1988 my ($self) = @_;
1444 1989
1990 $self->{size_req} ||= do {
1991 my ($max_w, $max_h) = $self->get_max_wh;
1992
1445 $self->{layout}->set_font ($self->{font}) if $self->{font}; 1993 $self->{layout}->set_font ($self->{font}) if $self->{font};
1446 $self->{layout}->set_width ($self->{max_w} || -1); 1994 $self->{layout}->set_width ($max_w);
1447 $self->{layout}->set_ellipsise ($self->{ellipsise}); 1995 $self->{layout}->set_ellipsise ($self->{ellipsise});
1448 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 1996 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1449 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 1997 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1450 1998
1451 my ($w, $h) = $self->{layout}->size; 1999 my ($w, $h) = $self->{layout}->size;
1452 2000
1453 if (exists $self->{template}) { 2001 if (exists $self->{template}) {
1454 $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);
1455 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE); 2004 $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1456 2005
1457 my ($w2, $h2) = $self->{template}->size; 2006 my ($w2, $h2) = $self->{template}->size;
1458 2007
1459 $w = List::Util::max $w, $w2; 2008 $w = List::Util::max $w, $w2;
1460 $h = List::Util::max $h, $h2; 2009 $h = List::Util::max $h, $h2;
2010 }
2011
2012 [$w, $h]
1461 } 2013 };
1462 2014
1463 ( 2015 @{ $self->{size_req} }
1464 $w + $self->{padding} * 2,
1465 $h + $self->{padding} * 2,
1466 )
1467} 2016}
1468 2017
2018sub baseline_shift {
2019 $_[0]{layout}->descent
2020}
2021
1469sub size_allocate { 2022sub invoke_size_allocate {
1470 my ($self, $w, $h) = @_; 2023 my ($self, $w, $h) = @_;
1471 2024
2025 delete $self->{ox};
2026
1472 delete $self->{texture}; 2027 delete $self->{texture}
2028 unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
2029
2030 1
1473} 2031}
1474 2032
1475sub set_fontsize { 2033sub set_fontsize {
1476 my ($self, $fontsize) = @_; 2034 my ($self, $fontsize) = @_;
1477 2035
1478 $self->{fontsize} = $fontsize; 2036 $self->{fontsize} = $fontsize;
2037 delete $self->{size_req};
1479 delete $self->{texture}; 2038 delete $self->{texture};
1480 2039
1481 $self->update; 2040 $self->realloc;
1482 $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;
1483} 2050}
1484 2051
1485sub _draw { 2052sub _draw {
1486 my ($self) = @_; 2053 my ($self) = @_;
1487 2054
1488 $self->SUPER::_draw; # draw background, if applicable 2055 $self->SUPER::_draw; # draw background, if applicable
1489 2056
1490 my $tex = $self->{texture} ||= do { 2057 my $size = $self->{texture} ||= do {
1491 $self->{layout}->set_foreground (@{$self->{fg}}); 2058 $self->{layout}->set_foreground (@{$self->{fg}});
1492 $self->{layout}->set_font ($self->{font}) if $self->{font}; 2059 $self->{layout}->set_font ($self->{font}) if $self->{font};
1493 $self->{layout}->set_width ($self->{w}); 2060 $self->{layout}->set_width ($self->{w});
1494 $self->{layout}->set_ellipsise ($self->{ellipsise}); 2061 $self->{layout}->set_ellipsise ($self->{ellipsise});
1495 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise}); 2062 $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1496 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 2063 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1497 2064
1498 my $tex = new_from_layout CFClient::Texture $self->{layout}; 2065 [$self->{layout}->size]
1499
1500 $self->{ox} = int ($self->{align} < 0 ? $self->{padding}
1501 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
1502 : ($self->{w} - $tex->{w}) * 0.5);
1503
1504 $self->{oy} = int ($self->{valign} < 0 ? $self->{padding}
1505 : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
1506 : ($self->{h} - $tex->{h}) * 0.5);
1507
1508 $tex
1509 }; 2066 };
1510 2067
1511 glEnable GL_TEXTURE_2D; 2068 unless (exists $self->{ox}) {
1512 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);
1513 2071
1514 if ($tex->{format} == GL_ALPHA) { 2072 $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1515 glColor @{$self->{fg}};
1516 $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
1517 } else {
1518 $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
1519 } 2073 };
1520 2074
1521 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;
1522} 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#}
1523 2094
1524############################################################################# 2095#############################################################################
1525 2096
1526package CFClient::UI::EntryBase; 2097package DC::UI::EntryBase;
1527 2098
1528our @ISA = CFClient::UI::Label::; 2099our @ISA = DC::UI::Label::;
1529 2100
1530use CFClient::OpenGL; 2101use DC::OpenGL;
1531 2102
1532sub new { 2103sub new {
1533 my $class = shift; 2104 my $class = shift;
1534 2105
1535 $class->SUPER::new ( 2106 $class->SUPER::new (
1536 fg => [1, 1, 1], 2107 fg => [1, 1, 1],
1537 bg => [0, 0, 0, 0.2], 2108 bg => [0, 0, 0, 0.2],
2109 outline => undef,
1538 active_bg => [1, 1, 1, 0.5], 2110 active_bg => [0, 0, 1, .2],
1539 active_fg => [0, 0, 0], 2111 active_fg => [1, 1, 1],
2112 active_outline => [1, 1, 0],
1540 can_hover => 1, 2113 can_hover => 1,
1541 can_focus => 1, 2114 can_focus => 1,
2115 align => 0,
1542 valign => 0, 2116 valign => 0.5,
1543 can_events => 1, 2117 can_events => 1,
2118 ellipsise => 0,
2119 padding_x => 4,
2120 padding_y => 2,
1544 #text => ... 2121 #text => ...
2122 #hidden => "*",
1545 @_ 2123 @_
1546 ) 2124 )
1547} 2125}
1548 2126
1549sub _set_text { 2127sub _set_text {
… …
1551 2129
1552 delete $self->{cur_h}; 2130 delete $self->{cur_h};
1553 2131
1554 return if $self->{text} eq $text; 2132 return if $self->{text} eq $text;
1555 2133
1556 delete $self->{texture};
1557
1558 $self->{last_activity} = $::NOW; 2134 $self->{last_activity} = $::NOW;
1559 $self->{text} = $text; 2135 $self->{text} = $text;
1560 2136
1561 $text =~ s/./*/g if $self->{hidden}; 2137 $text =~ s/./*/g if $self->{hidden};
1562 $self->{layout}->set_text ("$text "); 2138 $self->{layout}->set_text ("$text ");
2139 delete $self->{size_req};
1563 2140
1564 $self->_emit (changed => $self->{text}); 2141 $self->emit (changed => $self->{text});
2142
2143 $self->realloc;
2144 $self->update;
1565} 2145}
1566 2146
1567sub set_text { 2147sub set_text {
1568 my ($self, $text) = @_; 2148 my ($self, $text) = @_;
1569 2149
1570 $self->{cursor} = length $text; 2150 $self->{cursor} = length $text;
1571 $self->_set_text ($text); 2151 $self->_set_text ($text);
1572 $self->update;
1573 $self->check_size;
1574} 2152}
1575 2153
1576sub get_text { 2154sub get_text {
1577 $_[0]{text} 2155 $_[0]{text}
1578} 2156}
… …
1583 my ($w, $h) = $self->SUPER::size_request; 2161 my ($w, $h) = $self->SUPER::size_request;
1584 2162
1585 ($w + 1, $h) # add 1 for cursor 2163 ($w + 1, $h) # add 1 for cursor
1586} 2164}
1587 2165
1588sub key_down { 2166sub invoke_key_down {
1589 my ($self, $ev) = @_; 2167 my ($self, $ev) = @_;
1590 2168
1591 my $mod = $ev->{mod}; 2169 my $mod = $ev->{mod};
1592 my $sym = $ev->{sym}; 2170 my $sym = $ev->{sym};
1593 my $uni = $ev->{unicode}; 2171 my $uni = $ev->{unicode};
1594 2172
1595 my $text = $self->get_text; 2173 my $text = $self->get_text;
1596 2174
1597 if ($uni == 8) { 2175 $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2176
2177 if ($sym == DC::SDLK_BACKSPACE) {
1598 substr $text, --$self->{cursor}, 1, "" if $self->{cursor}; 2178 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1599 } elsif ($uni == 127) { 2179 } elsif ($sym == DC::SDLK_DELETE) {
1600 substr $text, $self->{cursor}, 1, ""; 2180 substr $text, $self->{cursor}, 1, "";
1601 } elsif ($sym == CFClient::SDLK_LEFT) { 2181 } elsif ($sym == DC::SDLK_LEFT) {
1602 --$self->{cursor} if $self->{cursor}; 2182 --$self->{cursor} if $self->{cursor};
1603 } elsif ($sym == CFClient::SDLK_RIGHT) { 2183 } elsif ($sym == DC::SDLK_RIGHT) {
1604 ++$self->{cursor} if $self->{cursor} < length $self->{text}; 2184 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1605 } 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 = "";
1606 $self->{cursor} = 0; 2199 $self->{cursor} = 0;
1607 } elsif ($sym == CFClient::SDLK_END) {
1608 $self->{cursor} = length $text;
1609 } elsif ($uni == 27) { 2200 } elsif ($uni == 27) {
1610 $self->_emit ('escape'); 2201 $self->emit ('escape');
1611 } elsif ($uni) { 2202 } elsif ($uni == 0x0d) {
2203 substr $text, $self->{cursor}++, 0, "\012";
2204 } elsif ($uni >= 0x20) {
1612 substr $text, $self->{cursor}++, 0, chr $uni; 2205 substr $text, $self->{cursor}++, 0, chr $uni;
2206 } else {
2207 return 0;
1613 } 2208 }
1614 2209
1615 $self->_set_text ($text); 2210 $self->_set_text ($text);
2211
2212 $self->realloc;
1616 $self->update; 2213 $self->update;
1617 $self->check_size;
1618}
1619 2214
2215 1
2216}
2217
1620sub focus_in { 2218sub invoke_focus_in {
1621 my ($self) = @_; 2219 my ($self) = @_;
1622 2220
1623 $self->{last_activity} = $::NOW; 2221 $self->{last_activity} = $::NOW;
1624 2222
1625 $self->SUPER::focus_in; 2223 $self->SUPER::invoke_focus_in
1626} 2224}
1627 2225
1628sub button_down { 2226sub invoke_button_down {
1629 my ($self, $ev, $x, $y) = @_; 2227 my ($self, $ev, $x, $y) = @_;
1630 2228
1631 $self->SUPER::button_down ($ev, $x, $y); 2229 $self->SUPER::invoke_button_down ($ev, $x, $y);
1632 2230
1633 my $idx = $self->{layout}->xy_to_index ($x, $y); 2231 my $idx = $self->{layout}->xy_to_index ($x, $y);
1634 2232
1635 # byte-index to char-index 2233 # byte-index to char-index
1636 my $text = $self->{text}; 2234 my $text = $self->{text};
1637 utf8::encode $text; 2235 utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
1638 $self->{cursor} = length substr $text, 0, $idx; 2236 $self->{cursor} = length $text;
1639 2237
1640 $self->_set_text ($self->{text}); 2238 $self->_set_text ($self->{text});
1641 $self->update; 2239 $self->update;
2240
2241 1
1642} 2242}
1643 2243
1644sub mouse_motion { 2244sub invoke_mouse_motion {
1645 my ($self, $ev, $x, $y) = @_; 2245 my ($self, $ev, $x, $y) = @_;
1646# 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
1647} 2249}
1648 2250
1649sub _draw { 2251sub _draw {
1650 my ($self) = @_; 2252 my ($self) = @_;
1651 2253
1652 local $self->{fg} = $self->{fg}; 2254 local $self->{fg} = $self->{fg};
1653 2255
1654 if ($FOCUS == $self) { 2256 if ($FOCUS == $self) {
1655 glColor @{$self->{active_bg}}; 2257 glColor_premultiply @{$self->{active_bg}};
1656 $self->{fg} = $self->{active_fg}; 2258 $self->{fg} = $self->{active_fg};
1657 } else { 2259 } else {
1658 glColor @{$self->{bg}}; 2260 glColor_premultiply @{$self->{bg}};
1659 } 2261 }
1660 2262
1661 glEnable GL_BLEND; 2263 glEnable GL_BLEND;
1662 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 2264 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1663 glBegin GL_QUADS;
1664 glVertex 0 , 0;
1665 glVertex 0 , $self->{h};
1666 glVertex $self->{w}, $self->{h}; 2265 glRect 0, 0, $self->{w}, $self->{h};
1667 glVertex $self->{w}, 0;
1668 glEnd;
1669 glDisable GL_BLEND; 2266 glDisable GL_BLEND;
1670 2267
1671 $self->SUPER::_draw; 2268 $self->SUPER::_draw;
1672 2269
1673 #TODO: force update every cursor change :( 2270 #TODO: force update every cursor change :(
… …
1675 2272
1676 unless (exists $self->{cur_h}) { 2273 unless (exists $self->{cur_h}) {
1677 my $text = substr $self->{text}, 0, $self->{cursor}; 2274 my $text = substr $self->{text}, 0, $self->{cursor};
1678 utf8::encode $text; 2275 utf8::encode $text;
1679 2276
1680 @$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);
1681 } 2278 }
1682 2279
1683 glColor @{$self->{fg}}; 2280 glColor_premultiply @{$self->{active_fg}};
1684 glBegin GL_LINES; 2281 glBegin GL_LINES;
1685 glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy}; 2282 glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1686 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};
1687 glEnd; 2284 glEnd;
1688 }
1689}
1690 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
1691package CFClient::UI::Entry; 2304package DC::UI::Entry;
1692 2305
1693our @ISA = CFClient::UI::EntryBase::; 2306our @ISA = DC::UI::EntryBase::;
1694 2307
1695use CFClient::OpenGL; 2308use DC::OpenGL;
1696 2309
2310sub new {
2311 my $class = shift;
2312
2313 $class->SUPER::new (
2314 history_pointer => -1,
2315 @_
2316 )
2317}
2318
2319
1697sub key_down { 2320sub invoke_key_down {
1698 my ($self, $ev) = @_; 2321 my ($self, $ev) = @_;
1699 2322
1700 my $sym = $ev->{sym}; 2323 my $sym = $ev->{sym};
1701 2324
1702 if ($sym == 13) { 2325 if ($ev->{uni} == 0x0d || $sym == 13) {
1703 unshift @{$self->{history}}, 2326 unshift @{$self->{history}},
1704 my $txt = $self->get_text; 2327 my $txt = $self->get_text;
2328
1705 $self->{history_pointer} = -1; 2329 $self->{history_pointer} = -1;
1706 $self->{history_saveback} = ''; 2330 $self->{history_saveback} = '';
1707 $self->_emit (activate => $txt); 2331 $self->emit (activate => $txt);
1708 $self->update; 2332 $self->update;
1709 2333
1710 } elsif ($sym == CFClient::SDLK_UP) { 2334 } elsif ($sym == DC::SDLK_UP) {
1711 if ($self->{history_pointer} < 0) { 2335 if ($self->{history_pointer} < 0) {
1712 $self->{history_saveback} = $self->get_text; 2336 $self->{history_saveback} = $self->get_text;
1713 } 2337 }
1714 if (@{$self->{history} || []} > 0) { 2338 if (@{$self->{history} || []} > 0) {
1715 $self->{history_pointer}++; 2339 $self->{history_pointer}++;
… …
1717 $self->{history_pointer} = @{$self->{history} || []} - 1; 2341 $self->{history_pointer} = @{$self->{history} || []} - 1;
1718 } 2342 }
1719 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2343 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1720 } 2344 }
1721 2345
1722 } elsif ($sym == CFClient::SDLK_DOWN) { 2346 } elsif ($sym == DC::SDLK_DOWN) {
1723 $self->{history_pointer}--; 2347 $self->{history_pointer}--;
1724 $self->{history_pointer} = -1 if $self->{history_pointer} < 0; 2348 $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1725 2349
1726 if ($self->{history_pointer} >= 0) { 2350 if ($self->{history_pointer} >= 0) {
1727 $self->set_text ($self->{history}->[$self->{history_pointer}]); 2351 $self->set_text ($self->{history}->[$self->{history_pointer}]);
1728 } else { 2352 } else {
2353 if (defined $self->{history_saveback}) {
1729 $self->set_text ($self->{history_saveback}); 2354 $self->set_text ($self->{history_saveback});
2355 $self->{history_saveback} = undef;
2356 }
1730 } 2357 }
1731 2358
1732 } else { 2359 } else {
1733 $self->SUPER::key_down ($ev); 2360 return $self->SUPER::invoke_key_down ($ev)
2361 }
2362
1734 } 2363 1
1735
1736} 2364}
1737 2365
1738############################################################################# 2366#############################################################################
1739 2367
1740package CFClient::UI::Button; 2368package DC::UI::TextEdit;
1741 2369
1742our @ISA = CFClient::UI::Label::; 2370our @ISA = DC::UI::EntryBase::;
1743 2371
1744use CFClient::OpenGL; 2372use DC::OpenGL;
1745
1746my @tex =
1747 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1748 qw(b1_button_active.png);
1749 2373
1750sub new { 2374sub new {
1751 my $class = shift; 2375 my $class = shift;
1752 2376
1753 $class->SUPER::new ( 2377 $class->SUPER::new (
1754 padding => 4, 2378 padding_y => 4,
1755 fg => [1, 1, 1], 2379
1756 active_fg => [0, 0, 1], 2380 @_
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 (
1757 can_hover => 1, 2431 can_hover => 1,
1758 align => 0, 2432 align => 0.5,
1759 valign => 0, 2433 valign => 0.5,
1760 can_events => 1, 2434 can_events => 1,
1761 @_ 2435 @_
1762 ) 2436 )
1763} 2437}
1764 2438
1765sub activate { }
1766
1767sub button_up { 2439sub invoke_button_up {
1768 my ($self, $ev, $x, $y) = @_; 2440 my ($self, $ev, $x, $y) = @_;
1769 2441
1770 $self->emit ("activate") 2442 $self->emit ("activate")
1771 if $x >= 0 && $x < $self->{w} 2443 if $x >= 0 && $x < $self->{w}
1772 && $y >= 0 && $y < $self->{h}; 2444 && $y >= 0 && $y < $self->{h};
2445
2446 1
1773} 2447}
1774 2448
1775sub _draw { 2449sub _draw {
1776 my ($self) = @_; 2450 my ($self) = @_;
1777
1778 local $self->{fg} = $self->{fg};
1779
1780 if ($GRAB == $self) {
1781 $self->{fg} = $self->{active_fg};
1782 }
1783 2451
1784 glEnable GL_TEXTURE_2D; 2452 glEnable GL_TEXTURE_2D;
1785 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2453 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1786 glColor 0, 0, 0, 1; 2454 glColor 0, 0, 0, 1;
1787 2455
2456 my $tex = $tex[$GRAB == $self];
1788 $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 2457 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
1789 2458
1790 glDisable GL_TEXTURE_2D; 2459 glDisable GL_TEXTURE_2D;
1791 2460
1792 $self->SUPER::_draw; 2461 $self->SUPER::_draw;
1793} 2462}
1794 2463
1795############################################################################# 2464#############################################################################
1796 2465
1797package CFClient::UI::CheckBox; 2466package DC::UI::Button;
1798 2467
1799our @ISA = CFClient::UI::DrawBG::; 2468our @ISA = DC::UI::Label::;
2469
2470use DC::OpenGL;
1800 2471
1801my @tex = 2472my @tex =
1802 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2473 map { new_from_resource DC::Texture $_, mipmap => 1 }
1803 qw(c1_checkbox_bg.png c1_checkbox_active.png); 2474 qw(b1_button_inactive.png b1_button_active.png);
1804
1805use CFClient::OpenGL;
1806 2475
1807sub new { 2476sub new {
1808 my $class = shift; 2477 my $class = shift;
1809 2478
1810 $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,
1811 padding => 2, 2536 padding_x => 2,
2537 padding_y => 2,
1812 fg => [1, 1, 1], 2538 fg => [1, 1, 1],
1813 active_fg => [1, 1, 0], 2539 active_fg => [1, 1, 0],
1814 bg => [0, 0, 0, 0.2], 2540 bg => [0, 0, 0, 0.2],
1815 active_bg => [1, 1, 1, 0.5], 2541 active_bg => [1, 1, 1, 0.5],
1816 state => 0, 2542 state => 0,
… …
1820} 2546}
1821 2547
1822sub size_request { 2548sub size_request {
1823 my ($self) = @_; 2549 my ($self) = @_;
1824 2550
1825 ($self->{padding} * 2 + 6) x 2 2551 ($self->{fontsize} * $::FONTSIZE) x 2
1826} 2552}
1827 2553
2554sub toggle {
2555 my ($self) = @_;
2556
2557 $self->{state} = !$self->{state};
2558 $self->emit (changed => $self->{state});
2559 $self->update;
2560}
2561
1828sub button_down { 2562sub invoke_button_down {
1829 my ($self, $ev, $x, $y) = @_; 2563 my ($self, $ev, $x, $y) = @_;
1830 2564
1831 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding} 2565 if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
1832 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) { 2566 && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
1833 $self->{state} = !$self->{state}; 2567 $self->toggle;
1834 $self->_emit (changed => $self->{state}); 2568 } else {
2569 return 0
2570 }
2571
1835 } 2572 1
1836} 2573}
1837 2574
1838sub _draw { 2575sub _draw {
1839 my ($self) = @_; 2576 my ($self) = @_;
1840 2577
1841 $self->SUPER::_draw; 2578 $self->SUPER::_draw;
1842 2579
1843 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0; 2580 glTranslate $self->{padding_x}, $self->{padding_y}, 0;
1844 2581
1845 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;
1846 2585
1847 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} }; 2586 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1848 2587
1849 my $tex = $self->{state} ? $tex[1] : $tex[0]; 2588 my $tex = $self->{state} ? $tex[1] : $tex[0];
1850 2589
… …
1853 glDisable GL_TEXTURE_2D; 2592 glDisable GL_TEXTURE_2D;
1854} 2593}
1855 2594
1856############################################################################# 2595#############################################################################
1857 2596
1858package CFClient::UI::Image; 2597package DC::UI::Image;
1859 2598
1860our @ISA = CFClient::UI::Base::; 2599our @ISA = DC::UI::DrawBG::;
1861 2600
1862use CFClient::OpenGL; 2601use DC::OpenGL;
1863use Carp qw/confess/;
1864 2602
1865our %loaded_images; 2603our %texture_cache;
1866 2604
1867sub new { 2605sub new {
1868 my $class = shift; 2606 my $class = shift;
1869 2607
1870 my $self = $class->SUPER::new (can_events => 0, @_); 2608 my $self = $class->SUPER::new (
2609 can_events => 0,
2610 scale => 1,
2611 @_,
2612 );
1871 2613
1872 $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";
1873 2616
1874 $loaded_images{$self->{image}} ||= 2617 $self->{tex} ||= $texture_cache{$self->{path}} ||=
1875 new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1; 2618 new_from_resource DC::Texture $self->{path}, mipmap => 1;
1876 2619
1877 my $tex = $self->{tex} = $loaded_images{$self->{image}}; 2620 DC::weaken $texture_cache{$self->{path}};
1878 2621
1879 Scalar::Util::weaken $loaded_images{$self->{image}}; 2622 $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
1880
1881 $self->{aspect} = $tex->{w} / $tex->{h};
1882 2623
1883 $self 2624 $self
1884} 2625}
1885 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
1886sub size_request { 2649sub size_request {
1887 my ($self) = @_; 2650 my ($self) = @_;
1888 2651
1889 ($self->{tex}->{w}, $self->{tex}->{h}) 2652 (int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
1890} 2653}
1891 2654
1892sub _draw { 2655sub _draw {
1893 my ($self) = @_; 2656 my ($self) = @_;
2657
2658 $self->SUPER::_draw;
1894 2659
1895 my $tex = $self->{tex}; 2660 my $tex = $self->{tex};
1896 2661
1897 my ($w, $h) = ($self->{w}, $self->{h}); 2662 my ($w, $h) = ($self->{w}, $self->{h});
1898 2663
… …
1911 glDisable GL_TEXTURE_2D; 2676 glDisable GL_TEXTURE_2D;
1912} 2677}
1913 2678
1914############################################################################# 2679#############################################################################
1915 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
1916package CFClient::UI::VGauge; 2721package DC::UI::VGauge;
1917 2722
1918our @ISA = CFClient::UI::Base::; 2723our @ISA = DC::UI::Base::;
1919 2724
1920use List::Util qw(min max); 2725use List::Util qw(min max);
1921 2726
1922use CFClient::OpenGL; 2727use DC::OpenGL;
1923 2728
1924my %tex = ( 2729my %tex = (
1925 food => [ 2730 food => [
1926 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2731 map { new_from_resource DC::Texture $_, mipmap => 1 }
1927 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/ 2732 qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
1928 ], 2733 ],
1929 grace => [ 2734 grace => [
1930 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2735 map { new_from_resource DC::Texture $_, mipmap => 1 }
1931 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/
1932 ], 2737 ],
1933 hp => [ 2738 hp => [
1934 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2739 map { new_from_resource DC::Texture $_, mipmap => 1 }
1935 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/ 2740 qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
1936 ], 2741 ],
1937 mana => [ 2742 mana => [
1938 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 2743 map { new_from_resource DC::Texture $_, mipmap => 1 }
1939 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/
1940 ], 2745 ],
1941); 2746);
1942 2747
1943# eg. VGauge->new (gauge => 'food'), default gauge: food 2748# eg. VGauge->new (gauge => 'food'), default gauge: food
… …
2003 my $ycut1 = max 0, min 1, $ycut; 2808 my $ycut1 = max 0, min 1, $ycut;
2004 my $ycut2 = max 0, min 1, $ycut - 1; 2809 my $ycut2 = max 0, min 1, $ycut - 1;
2005 2810
2006 my $h1 = $self->{h} * (1 - $ycut1); 2811 my $h1 = $self->{h} * (1 - $ycut1);
2007 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);
2008 2816
2009 glEnable GL_BLEND; 2817 glEnable GL_BLEND;
2010 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;
2011 glEnable GL_TEXTURE_2D; 2820 glEnable GL_TEXTURE_2D;
2012 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 2821 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2013 2822
2014 glBindTexture GL_TEXTURE_2D, $t1->{name}; 2823 glBindTexture GL_TEXTURE_2D, $t1->{name};
2015 glBegin GL_QUADS; 2824 glBegin GL_QUADS;
… …
2030 2839
2031 if ($t3) { 2840 if ($t3) {
2032 glBindTexture GL_TEXTURE_2D, $t3->{name}; 2841 glBindTexture GL_TEXTURE_2D, $t3->{name};
2033 glBegin GL_QUADS; 2842 glBegin GL_QUADS;
2034 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2; 2843 glTexCoord 0 , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
2035 glTexCoord 0 , $t3->{t}; glVertex 0 , $self->{h}; 2844 glTexCoord 0 , $t3->{t}; glVertex 0 , $h3;
2036 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $self->{h}; 2845 glTexCoord $t3->{s}, $t3->{t}; glVertex $w, $h3;
2037 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2; 2846 glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
2038 glEnd; 2847 glEnd;
2039 } 2848 }
2040 2849
2041 glDisable GL_BLEND; 2850 glDisable GL_BLEND;
2042 glDisable GL_TEXTURE_2D; 2851 glDisable GL_TEXTURE_2D;
2043} 2852}
2044 2853
2045############################################################################# 2854#############################################################################
2046 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
2047package CFClient::UI::Gauge; 3010package DC::UI::Gauge;
2048 3011
2049our @ISA = CFClient::UI::VBox::; 3012our @ISA = DC::UI::VBox::;
2050 3013
2051sub new { 3014sub new {
2052 my ($class, %arg) = @_; 3015 my ($class, %arg) = @_;
2053 3016
2054 my $self = $class->SUPER::new ( 3017 my $self = $class->SUPER::new (
… …
2056 can_hover => 1, 3019 can_hover => 1,
2057 can_events => 1, 3020 can_events => 1,
2058 %arg, 3021 %arg,
2059 ); 3022 );
2060 3023
2061 $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");
2062 $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);
2063 $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");
2064 3027
2065 $self 3028 $self
2066} 3029}
2067 3030
2068sub set_fontsize { 3031sub set_fontsize {
… …
2089 $self->{value}->set_text ($val); 3052 $self->{value}->set_text ($val);
2090} 3053}
2091 3054
2092############################################################################# 3055#############################################################################
2093 3056
2094package CFClient::UI::Slider; 3057package DC::UI::Slider;
2095 3058
2096use strict; 3059use common::sense;
2097 3060
2098use CFClient::OpenGL; 3061use DC::OpenGL;
2099 3062
2100our @ISA = CFClient::UI::DrawBG::; 3063our @ISA = DC::UI::DrawBG::;
2101 3064
2102my @tex = 3065my @tex =
2103 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ } 3066 map { new_from_resource DC::Texture $_ }
2104 qw(s1_slider.png s1_slider_bg.png); 3067 qw(s1_slider.png s1_slider_bg.png);
2105 3068
2106sub new { 3069sub new {
2107 my $class = shift; 3070 my $class = shift;
2108 3071
… …
2115 fg => [1, 1, 1], 3078 fg => [1, 1, 1],
2116 active_fg => [0, 0, 0], 3079 active_fg => [0, 0, 0],
2117 bg => [0, 0, 0, 0.2], 3080 bg => [0, 0, 0, 0.2],
2118 active_bg => [1, 1, 1, 0.5], 3081 active_bg => [1, 1, 1, 0.5],
2119 range => [0, 0, 100, 10, 0], 3082 range => [0, 0, 100, 10, 0],
2120 req_w => $::WIDTH / 80, 3083 min_w => $::WIDTH / 80,
2121 req_h => $::WIDTH / 80, 3084 min_h => $::WIDTH / 80,
2122 vertical => 0, 3085 vertical => 0,
2123 can_hover => 1, 3086 can_hover => 1,
2124 inner_pad => 0.02, 3087 inner_pad => 0.02,
2125 @_ 3088 @_
2126 ); 3089 );
… …
2132} 3095}
2133 3096
2134sub set_range { 3097sub set_range {
2135 my ($self, $range) = @_; 3098 my ($self, $range) = @_;
2136 3099
2137 $self->{range} = $range; 3100 ($range, $self->{range}) = ($self->{range}, $range);
2138 3101
3102 if ("@$range" ne "@{$self->{range}}") {
2139 $self->update; 3103 $self->update;
3104 $self->set_value ($self->{range}[0]);
3105 }
2140} 3106}
2141 3107
2142sub set_value { 3108sub set_value {
2143 my ($self, $value) = @_; 3109 my ($self, $value) = @_;
2144 3110
2145 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}}; 3111 my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2146 3112
2147 $hi = $lo + 1 if $hi <= $lo; 3113 $hi = $lo if $hi < $lo;
2148 3114
2149 $page = $hi - $lo if $page > $hi - $lo; 3115 $value = $hi - $page if $value > $hi - $page;
2150
2151 $value = $lo if $value < $lo; 3116 $value = $lo if $value < $lo;
2152 $value = $hi - $page if $value > $hi - $page;
2153 3117
2154 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit 3118 $value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2155 if $unit; 3119 if $unit;
2156 3120
2157 @{$self->{range}} = ($value, $lo, $hi, $page, $unit); 3121 @{$self->{range}} = ($value, $lo, $hi, $page, $unit);
2158 3122
2159 if ($value != $old_value) { 3123 if ($value != $old_value) {
2160 $self->_emit (changed => $value); 3124 $self->emit (changed => $value);
2161 $self->update; 3125 $self->update;
2162 } 3126 }
2163} 3127}
2164 3128
2165sub size_request { 3129sub size_request {
2166 my ($self) = @_; 3130 my ($self) = @_;
2167 3131
2168 my $w = $self->{req_w}; 3132 ($self->{req_w}, $self->{req_h})
2169 my $h = $self->{req_h};
2170
2171 $self->{vertical} ? ($h, $w) : ($w, $h)
2172} 3133}
2173 3134
2174sub button_down { 3135sub invoke_button_down {
2175 my ($self, $ev, $x, $y) = @_; 3136 my ($self, $ev, $x, $y) = @_;
2176 3137
2177 $self->SUPER::button_down ($ev, $x, $y); 3138 $self->SUPER::invoke_button_down ($ev, $x, $y);
2178 3139
2179 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x]; 3140 $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2180 3141
2181 $self->mouse_motion ($ev, $x, $y); 3142 $self->invoke_mouse_motion ($ev, $x, $y);
2182}
2183 3143
3144 1
3145}
3146
2184sub mouse_motion { 3147sub invoke_mouse_motion {
2185 my ($self, $ev, $x, $y) = @_; 3148 my ($self, $ev, $x, $y) = @_;
2186 3149
2187 if ($GRAB == $self) { 3150 if ($GRAB == $self) {
2188 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w}); 3151 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2189 3152
2190 my (undef, $lo, $hi, $page) = @{$self->{range}}; 3153 my (undef, $lo, $hi, $page) = @{$self->{range}};
2191 3154
2192 $x = ($x - $self->{click}[1]) / ($w * $self->{scale}); 3155 $x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2193 3156
2194 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo)); 3157 $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
3158 } else {
3159 return 0;
3160 }
3161
2195 } 3162 1
3163}
3164
3165sub invoke_mouse_wheel {
3166 my ($self, $ev) = @_;
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
2196} 3175}
2197 3176
2198sub update { 3177sub update {
2199 my ($self) = @_; 3178 my ($self) = @_;
2200 3179
2201 $CFClient::UI::ROOT->on_post_alloc ($self => sub { 3180 delete $self->{knob_w};
3181 $self->SUPER::update;
3182}
3183
3184sub _draw {
3185 my ($self) = @_;
3186
3187 unless ($self->{knob_w}) {
2202 $self->set_value ($self->{range}[0]); 3188 $self->set_value ($self->{range}[0]);
2203 3189
2204 my ($value, $lo, $hi, $page) = @{$self->{range}}; 3190 my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2205 my $range = ($hi - $page - $lo) || 1e-100; 3191 my $range = ($hi - $page - $lo) || 1e-10;
2206 3192
2207 my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1; 3193 my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2208 3194
2209 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5; 3195 $self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2210 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100; 3196 $self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2211 3197
2212 $value = ($value - $lo) / $range; 3198 $value = ($value - $lo) / $range;
2213 $value = $value * $self->{scale} + $self->{offset}; 3199 $value = $value * $self->{scale} + $self->{offset};
2214 3200
2215 $self->{knob_x} = $value - $knob_w * 0.5; 3201 $self->{knob_x} = $value - $knob_w * 0.5;
2216 $self->{knob_w} = $knob_w; 3202 $self->{knob_w} = $knob_w;
2217 }); 3203 }
2218
2219 $self->SUPER::update;
2220}
2221
2222sub _draw {
2223 my ($self) = @_;
2224 3204
2225 $self->SUPER::_draw (); 3205 $self->SUPER::_draw ();
2226 3206
2227 glScale $self->{w}, $self->{h}; 3207 glScale $self->{w}, $self->{h};
2228 3208
… …
2248 glDisable GL_TEXTURE_2D; 3228 glDisable GL_TEXTURE_2D;
2249} 3229}
2250 3230
2251############################################################################# 3231#############################################################################
2252 3232
2253package CFClient::UI::ValSlider; 3233package DC::UI::ValSlider;
2254 3234
2255our @ISA = CFClient::UI::HBox::; 3235our @ISA = DC::UI::HBox::;
2256 3236
2257sub new { 3237sub new {
2258 my ($class, %arg) = @_; 3238 my ($class, %arg) = @_;
2259 3239
2260 my $range = delete $arg{range}; 3240 my $range = delete $arg{range};
2261 3241
2262 my $self = $class->SUPER::new ( 3242 my $self = $class->SUPER::new (
2263 slider => (new CFClient::UI::Slider expand => 1, range => $range), 3243 slider => (new DC::UI::Slider expand => 1, range => $range),
2264 entry => (new CFClient::UI::Label text => "", template => delete $arg{template}), 3244 entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2265 to_value => sub { shift }, 3245 to_value => sub { shift },
2266 from_value => sub { shift }, 3246 from_value => sub { shift },
2267 %arg, 3247 %arg,
2268 ); 3248 );
2269 3249
… …
2289sub set_range { shift->{slider}->set_range (@_) } 3269sub set_range { shift->{slider}->set_range (@_) }
2290sub set_value { shift->{slider}->set_value (@_) } 3270sub set_value { shift->{slider}->set_value (@_) }
2291 3271
2292############################################################################# 3272#############################################################################
2293 3273
2294package CFClient::UI::TextView; 3274package DC::UI::TextScroller;
2295 3275
2296our @ISA = CFClient::UI::HBox::; 3276our @ISA = DC::UI::HBox::;
2297 3277
2298use CFClient::OpenGL; 3278use DC::OpenGL;
2299 3279
2300sub new { 3280sub new {
2301 my $class = shift; 3281 my $class = shift;
2302 3282
2303 my $self = $class->SUPER::new ( 3283 my $self = $class->SUPER::new (
2304 fontsize => 1, 3284 fontsize => 1,
2305 can_events => 0, 3285 can_events => 1,
3286 indent => 0,
2306 #font => default_font 3287 #font => default_font
2307 @_, 3288 @_,
2308 3289
2309 layout => (new CFClient::Layout 1), 3290 layout => (new DC::Layout),
2310 par => [], 3291 par => [],
3292 max_par => 0,
2311 height => 0, 3293 height => 0,
2312 children => [ 3294 children => [
2313 (new CFClient::UI::Empty expand => 1), 3295 (new DC::UI::Empty expand => 1),
2314 (new CFClient::UI::Slider vertical => 1), 3296 (new DC::UI::Slider vertical => 1),
2315 ], 3297 ],
2316 ); 3298 );
2317 3299
2318 $self->{children}[1]->connect (changed => sub { $self->update }); 3300 $self->{children}[1]->connect (changed => sub { $self->update });
2319 3301
… …
2325 3307
2326 $self->{fontsize} = $fontsize; 3308 $self->{fontsize} = $fontsize;
2327 $self->reflow; 3309 $self->reflow;
2328} 3310}
2329 3311
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
2330sub size_allocate { 3321sub invoke_size_allocate {
2331 my ($self, $w, $h) = @_; 3322 my ($self, $w, $h) = @_;
2332 3323
2333 $self->SUPER::size_allocate ($w, $h); 3324 my ($empty, $slider, @other) = @{ $self->{children} };
3325 $_->configure (@$_{qw(x y req_w req_h)}) for @other;
2334 3326
2335 $self->{layout}->set_font ($self->{font}) if $self->{font}; 3327 $self->{layout}->set_font ($self->{font}) if $self->{font};
2336 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE); 3328 $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2337 $self->{layout}->set_width ($self->{children}[0]{w}); 3329 $self->{layout}->set_width ($empty->{w});
3330 $self->{layout}->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2338 3331
2339 $self->reflow; 3332 $self->reflow;
2340}
2341 3333
2342sub text_size { 3334 local $self->{children} = [$empty, $slider];
3335 $self->SUPER::invoke_size_allocate ($w, $h)
3336}
3337
3338sub invoke_mouse_wheel {
2343 my ($self, $text, $indent) = @_; 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) = @_;
2344 3350
2345 my $layout = $self->{layout}; 3351 my $layout = $self->{layout};
2346 3352
3353 $layout->set_font ($self->{font}) if $self->{font};
3354 $layout->set_foreground (@{$para->{fg}});
2347 $layout->set_height ($self->{fontsize} * $::FONTSIZE); 3355 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2348 $layout->set_width ($self->{children}[0]{w} - $indent); 3356 $layout->set_width ($self->{children}[0]{w} - $para->{indent});
3357 $layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2349 $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}}
2350 3364 );
3365
2351 $layout->size 3366 $layout
2352} 3367}
2353 3368
2354sub reflow { 3369sub reflow {
2355 my ($self) = @_; 3370 my ($self) = @_;
2356 3371
… …
2363 3378
2364 # todo: base offset on lines or so, not on pixels 3379 # todo: base offset on lines or so, not on pixels
2365 $self->{children}[1]->set_value ($offset); 3380 $self->{children}[1]->set_value ($offset);
2366} 3381}
2367 3382
3383sub current_paragraph {
3384 my ($self) = @_;
3385
3386 $self->{top_paragraph} - 1
3387}
3388
3389sub scroll_to {
3390 my ($self, $para) = @_;
3391
3392 $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
3393
3394 $self->{scroll_to} = $para;
3395 $self->update;
3396}
3397
2368sub clear { 3398sub clear {
2369 my ($self) = @_; 3399 my ($self) = @_;
3400
3401 my (undef, undef, @other) = @{ $self->{children} };
3402 $self->remove ($_) for @other;
2370 3403
2371 $self->{par} = []; 3404 $self->{par} = [];
2372 $self->{height} = 0; 3405 $self->{height} = 0;
2373 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]); 3406 $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2374} 3407}
2375 3408
2376sub add_paragraph { 3409sub add_paragraph {
2377 my ($self, $color, $text, $indent) = @_; 3410 my $self = shift;
2378 3411
2379 for my $line (split /\n/, $text) { 3412 for my $para (@_) {
2380 my ($w, $h) = $self->text_size ($line); 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 };
3422
3423 $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
3424 push @{$self->{par}}, $para;
3425 }
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
2381 $self->{height} += $h; 3464 $self->{height} = $height;
2382 push @{$self->{par}}, [$w + $indent, $h, $color, $indent, $line]; 3465 $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2383 }
2384 3466
2385 $self->{children}[1]->set_range ([$self->{height}, 0, $self->{height}, $self->{h}, 1]); 3467 delete $self->{texture};
3468 }
3469
3470 if (my $paridx = delete $self->{scroll_to}) {
3471 $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
3472 }
2386} 3473}
2387 3474
2388sub update { 3475sub update {
2389 my ($self) = @_; 3476 my ($self) = @_;
2390 3477
… …
2392 3479
2393 return unless $self->{h} > 0; 3480 return unless $self->{h} > 0;
2394 3481
2395 delete $self->{texture}; 3482 delete $self->{texture};
2396 3483
2397 $ROOT->on_post_alloc ($self, sub { 3484 $ROOT->on_post_alloc ($self => sub {
3485 $self->force_uptodate;
3486
2398 my ($W, $H) = @{$self->{children}[0]}{qw(w h)}; 3487 my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2399 3488
2400 if (delete $self->{need_reflow}) {
2401 my $height = 0;
2402
2403 my $layout = $self->{layout};
2404
2405 $layout->set_height ($self->{fontsize} * $::FONTSIZE);
2406
2407 for (@{$self->{par}}) {
2408 if (1 || $_->[0] >= $W) { # TODO: works,but needs reconfigure etc. support
2409 $layout->set_width ($W - $_->[3]);
2410 $layout->set_markup ($_->[4]);
2411 my ($w, $h) = $layout->size;
2412 $_->[0] = $w + $_->[3];
2413 $_->[1] = $h;
2414 }
2415
2416 $height += $_->[1];
2417 }
2418
2419 $self->{height} = $height;
2420
2421 $self->{children}[1]->set_range ([$height, 0, $height, $H, 1]);
2422
2423 delete $self->{texture};
2424 }
2425
2426 $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub { 3489 $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
2427 glClearColor 0.5, 0.5, 0.5, 0; 3490 glClearColor 0, 0, 0, 0;
2428 glClear GL_COLOR_BUFFER_BIT; 3491 glClear GL_COLOR_BUFFER_BIT;
2429 3492
3493 package DC::UI::Base;
3494 local ($draw_x, $draw_y, $draw_w, $draw_h) =
3495 (0, 0, $self->{w}, $self->{h});
3496
3497 my $top = int $self->{children}[1]{range}[0];
3498
3499 my $paridx = 0;
3500 my $top_paragraph;
2430 my $top = int $self->{children}[1]{range}[0]; 3501 my $top = int $self->{children}[1]{range}[0];
2431 3502
2432 my $y0 = $top; 3503 my $y0 = $top;
2433 my $y1 = $top + $H; 3504 my $y1 = $top + $H;
2434 3505
2435 my $y = 0;
2436
2437 my $layout = $self->{layout};
2438
2439 $layout->set_font ($self->{font}) if $self->{font};
2440
2441 glEnable GL_BLEND;
2442 #TODO# not correct in windows where rgba is forced off
2443 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2444
2445 for my $par (@{$self->{par}}) { 3506 for my $para (@{$self->{par}}) {
2446 my $h = $par->[1]; 3507 my $h = $para->{h};
3508 my $y = $para->{y};
2447 3509
2448 if ($y0 < $y + $h && $y < $y1) { 3510 if ($y0 < $y + $h && $y < $y1) {
2449 $layout->set_foreground (@{ $par->[2] }); 3511 my $layout = $self->get_layout ($para);
2450 $layout->set_width ($W - $par->[3]);
2451 $layout->set_markup ($par->[4]);
2452 3512
2453 my ($w, $h, $data, $format, $internalformat) = $layout->render; 3513 $layout->render ($para->{indent}, $y - $y0);
3514 $layout->draw;
2454 3515
2455 glRasterPos $par->[3], $y - $y0; 3516 if (my @w = @{ $para->{widget} }) {
2456 glDrawPixels $w, $h, $format, GL_UNSIGNED_BYTE, $data; 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 }
2457 } 3528 }
2458 3529
2459 $y += $h; 3530 $paridx++;
3531 $top_paragraph ||= $paridx if $y >= $top;
2460 } 3532 }
2461 3533
2462 glDisable GL_BLEND; 3534 $self->{top_paragraph} = $top_paragraph;
2463 }; 3535 };
2464 }); 3536 });
2465} 3537}
2466 3538
3539sub reconfigure {
3540 my ($self) = @_;
3541
3542 $self->SUPER::reconfigure;
3543
3544 $_->{w} = 1e10 for @{ $self->{par} };
3545 $self->reflow;
3546}
3547
2467sub _draw { 3548sub _draw {
2468 my ($self) = @_; 3549 my ($self) = @_;
2469 3550
2470 glEnable GL_TEXTURE_2D; 3551 glEnable GL_TEXTURE_2D;
2471 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2472 glColor 1, 1, 1, 1; 3553 glColor 0, 0, 0, 1;
2473 $self->{texture}->draw_quad_alpha (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});
2474 glDisable GL_TEXTURE_2D; 3555 glDisable GL_TEXTURE_2D;
2475 3556
2476 $self->{children}[1]->draw; 3557 $self->{children}[1]->draw;
2477
2478} 3558}
2479 3559
2480############################################################################# 3560#############################################################################
2481 3561
2482package CFClient::UI::Animator; 3562package DC::UI::Animator;
2483 3563
2484use CFClient::OpenGL; 3564use DC::OpenGL;
2485 3565
2486our @ISA = CFClient::UI::Bin::; 3566our @ISA = DC::UI::Bin::;
2487 3567
2488sub moveto { 3568sub moveto {
2489 my ($self, $x, $y) = @_; 3569 my ($self, $x, $y) = @_;
2490 3570
2491 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 3571 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
2519 glPopMatrix; 3599 glPopMatrix;
2520} 3600}
2521 3601
2522############################################################################# 3602#############################################################################
2523 3603
2524package CFClient::UI::Flopper; 3604package DC::UI::Flopper;
2525 3605
2526our @ISA = CFClient::UI::Button::; 3606our @ISA = DC::UI::Button::;
2527 3607
2528sub new { 3608sub new {
2529 my $class = shift; 3609 my $class = shift;
2530 3610
2531 my $self = $class->SUPER::new ( 3611 my $self = $class->SUPER::new (
2532 state => 0, 3612 state => 0,
2533 connect_activate => \&toggle_flopper, 3613 on_activate => \&toggle_flopper,
2534 @_ 3614 @_
2535 ); 3615 );
2536 3616
2537 if ($self->{state}) {
2538 $self->{state} = 0;
2539 $self->toggle_flopper;
2540 }
2541
2542 $self 3617 $self
2543} 3618}
2544 3619
2545sub toggle_flopper { 3620sub toggle_flopper {
2546 my ($self) = @_; 3621 my ($self) = @_;
2547 3622
2548 # TODO: use animation 3623 $self->{other}->toggle_visibility;
2549 if ($self->{state} = !$self->{state}) {
2550 $CFClient::UI::ROOT->add ($self->{other});
2551 $self->{other}->move ($self->coord2global (0, $self->{h}));
2552 $self->_emit ("open");
2553 } else {
2554 $CFClient::UI::ROOT->remove ($self->{other});
2555 $self->_emit ("close");
2556 }
2557
2558 $self->_emit (changed => $self->{state});
2559} 3624}
2560 3625
2561############################################################################# 3626#############################################################################
2562 3627
2563package CFClient::UI::Tooltip; 3628package DC::UI::Tooltip;
2564 3629
2565our @ISA = CFClient::UI::Bin::; 3630our @ISA = DC::UI::Bin::;
2566 3631
2567use CFClient::OpenGL; 3632use DC::OpenGL;
2568 3633
2569sub new { 3634sub new {
2570 my $class = shift; 3635 my $class = shift;
2571 3636
2572 $class->SUPER::new ( 3637 $class->SUPER::new (
… …
2576} 3641}
2577 3642
2578sub set_tooltip_from { 3643sub set_tooltip_from {
2579 my ($self, $widget) = @_; 3644 my ($self, $widget) = @_;
2580 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
2581 $self->add (new CFClient::UI::Label 3662 $self->add (new DC::UI::Label
3663 fg => $DC::THEME{tooltip_fg},
2582 markup => $widget->{tooltip}, 3664 markup => $tip,
2583 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH, 3665 max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3666 align => 0,
2584 fontsize => 0.8, 3667 fontsize => 0.8,
2585 fg => [0, 0, 0, 1], 3668 style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
2586 ellipsise => 0, 3669 ellipsise => 0,
2587 font => ($widget->{tooltip_font} || $::FONT_PROP), 3670 font => ($widget->{tooltip_font} || $::FONT_PROP),
2588 ); 3671 );
2589} 3672}
2590 3673
… …
2594 my ($w, $h) = @{$self->child}{qw(req_w req_h)}; 3677 my ($w, $h) = @{$self->child}{qw(req_w req_h)};
2595 3678
2596 ($w + 4, $h + 4) 3679 ($w + 4, $h + 4)
2597} 3680}
2598 3681
2599sub size_allocate { 3682sub invoke_size_allocate {
2600 my ($self, $w, $h) = @_; 3683 my ($self, $w, $h) = @_;
2601 3684
2602 $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 });
2603} 3708}
2604 3709
2605sub _draw { 3710sub _draw {
2606 my ($self) = @_; 3711 my ($self) = @_;
2607 3712
2608 glTranslate 0.375, 0.375;
2609
2610 my ($w, $h) = @$self{qw(w h)}; 3713 my ($w, $h) = @$self{qw(w h)};
2611 3714
2612 glColor 1, 0.8, 0.4; 3715 glColor @{ $DC::THEME{tooltip_bg} };
2613 glBegin GL_QUADS; 3716 glRect 0, 0, $w, $h;
2614 glVertex 0 , 0;
2615 glVertex 0 , $h;
2616 glVertex $w, $h;
2617 glVertex $w, 0;
2618 glEnd;
2619 3717
2620 glColor 0, 0, 0; 3718 glColor @{ $DC::THEME{tooltip_border} };
2621 glBegin GL_LINE_LOOP; 3719 glRect_lineloop .5, .5, $w + .5, $h + .5;
2622 glVertex 0 , 0;
2623 glVertex 0 , $h;
2624 glVertex $w, $h;
2625 glVertex $w, 0;
2626 glEnd;
2627 3720
2628 glTranslate 2 - 0.375, 2 - 0.375; 3721 glTranslate 2, 2;
3722
2629 $self->SUPER::_draw; 3723 $self->SUPER::_draw;
2630} 3724}
2631 3725
2632############################################################################# 3726#############################################################################
2633 3727
2634package CFClient::UI::Face; 3728package DC::UI::Face;
2635 3729
2636our @ISA = CFClient::UI::Base::; 3730our @ISA = DC::UI::DrawBG::;
2637 3731
2638use CFClient::OpenGL; 3732use DC::OpenGL;
2639 3733
2640sub new { 3734sub new {
2641 my $class = shift; 3735 my $class = shift;
2642 3736
2643 my $self = $class->SUPER::new ( 3737 my $self = $class->SUPER::new (
3738 size_w => 32,
3739 size_h => 8,
2644 aspect => 1, 3740 aspect => 1,
2645 can_events => 0, 3741 can_events => 0,
2646 @_, 3742 @_,
2647 ); 3743 );
2648 3744
2649 if ($self->{anim} && $self->{animspeed}) { 3745 $self->update_anim;
2650 Scalar::Util::weaken (my $widget = $self);
2651
2652 $self->{timer} = Event->timer (
2653 at => $self->{animspeed} * int $::NOW / $self->{animspeed},
2654 hard => 1,
2655 interval => $self->{animspeed},
2656 cb => sub {
2657 ++$widget->{frame};
2658 $widget->update;
2659 },
2660 );
2661 }
2662 3746
2663 $self 3747 $self
2664} 3748}
2665 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 }
3807}
3808
2666sub size_request { 3809sub size_request {
2667 (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)
2668} 3827}
2669 3828
2670sub update { 3829sub update {
2671 my ($self) = @_; 3830 my ($self) = @_;
2672 3831
2673 return unless $self->{visible}; 3832 return unless $self->{visible};
2674 3833
2675 $self->SUPER::update; 3834 $self->SUPER::update;
2676} 3835}
2677 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
3864}
3865
2678sub _draw { 3866sub _draw {
2679 my ($self) = @_; 3867 my ($self) = @_;
2680 3868
2681 return unless $::CONN; 3869 $self->SUPER::_draw;
2682 3870
2683 my $face; 3871 if (my $tex = $self->{tex}) {
2684
2685 if ($self->{frame}) {
2686 my $anim = $::CONN->{anim}[$self->{anim}];
2687
2688 $face = $anim->[ $self->{frame} % @$anim ]
2689 if $anim && @$anim;
2690 }
2691
2692 my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
2693
2694 if ($tex) {
2695 glEnable GL_TEXTURE_2D; 3872 glEnable GL_TEXTURE_2D;
2696 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 3873 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2697 glColor 1, 1, 1, 1; 3874 glColor 0, 0, 0, 1;
2698 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h}); 3875 $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2699 glDisable GL_TEXTURE_2D; 3876 glDisable GL_TEXTURE_2D;
2700 } 3877 }
2701} 3878}
2702 3879
2703sub DESTROY { 3880sub destroy {
2704 my ($self) = @_; 3881 my ($self) = @_;
2705 3882
2706 $self->{timer}->cancel 3883 (delete $self->{timer})->cancel
2707 if $self->{timer}; 3884 if $self->{timer};
2708 3885
2709 $self->SUPER::DESTROY; 3886 $self->SUPER::destroy;
2710} 3887}
2711 3888
2712############################################################################# 3889#############################################################################
2713 3890
2714package CFClient::UI::InventoryItem; 3891package DC::UI::Buttonbar;
2715 3892
2716our @ISA = CFClient::UI::HBox::; 3893our @ISA = DC::UI::HBox::;
2717 3894
2718sub new { 3895# TODO: should actually wrap buttons and other goodies.
2719 my $class = shift;
2720
2721 my %args = @_;
2722
2723 my $item = delete $args{item};
2724
2725 my $desc = CFClient::Item::desc_string $item;
2726
2727 my $self = $class->SUPER::new (
2728 can_hover => 1,
2729 can_events => 1,
2730 tooltip => ((CFClient::UI::Label::escape $desc)
2731 . "\n<small>leftclick - examine\nshift+leftclick - move/pickup/drop\nmiddle click - apply\nrightclick - menu</small>"),
2732 connect_button_down => sub {
2733 my ($self, $ev, $x, $y) = @_;
2734
2735 # todo: maybe put examine on 1? but should just be a tooltip :(
2736 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
2737 my $targ = $::CONN->{player}{tag};
2738
2739 if ($item->{container} == $::CONN->{player}{tag}) {
2740 $targ = $main::OPENCONT;
2741 }
2742
2743 $::CONN->send ("move $targ $item->{tag} 0");
2744 } elsif ($ev->{button} == 1) {
2745 $::CONN->send ("examine $item->{tag}");
2746 } elsif ($ev->{button} == 2) {
2747 $::CONN->send ("apply $item->{tag}");
2748 } elsif ($ev->{button} == 3) {
2749 my @menu_items = (
2750 ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
2751 ["mark", sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
2752 ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
2753 (
2754 $item->{flags} & Crossfire::Protocol::F_LOCKED
2755 ? (
2756 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
2757 )
2758 : (
2759 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
2760 ["drop", sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
2761 )
2762 ),
2763 );
2764
2765 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
2766 }
2767
2768 1
2769 },
2770 %args
2771 );
2772
2773
2774 $self->add (new CFClient::UI::Face
2775 can_events => 0,
2776 face => $item->{face},
2777 anim => $item->{anim},
2778 animspeed => $item->{animspeed},
2779 );
2780
2781 $self->add ($self->{name_lbl} = new CFClient::UI::Label can_events => 0);
2782
2783 $self->{item} = $item;
2784
2785 $self->update_item;
2786
2787 $self
2788}
2789
2790sub update_item {
2791 my ($self) = @_;
2792
2793 my $desc = CFClient::Item::desc_string ($self->{item});
2794
2795 $self->{name_lbl}->set_text ($desc);
2796}
2797 3896
2798############################################################################# 3897#############################################################################
2799 3898
2800package CFClient::UI::Inventory;
2801
2802our @ISA = CFClient::UI::ScrolledWindow::;
2803
2804sub new {
2805 my $class = shift;
2806
2807 my $self = $class->SUPER::new (
2808 scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
2809 @_,
2810 );
2811
2812 $self
2813}
2814
2815sub set_items {
2816 my ($self, $items) = @_;
2817
2818 $self->{scrolled}->clear;
2819 return unless $items;
2820
2821 my @items = sort {
2822 ($a->{type} <=> $b->{type})
2823 or ($a->{name} cmp $b->{name})
2824 } @$items;
2825
2826 $self->{real_items} = \@items;
2827
2828 my $row = 0;
2829 for my $item (@items) {
2830 CFClient::Item::update_widgets $item;
2831
2832 $self->{scrolled}->add (0, $row, $item->{face_widget});
2833 $self->{scrolled}->add (1, $row, $item->{desc_widget});
2834 $self->{scrolled}->add (2, $row, $item->{weight_widget});
2835
2836 $row++;
2837 }
2838
2839# $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
2840}
2841
2842sub size_request {
2843 my ($self) = @_;
2844 ($self->{req_w}, $self->{req_h});
2845}
2846
2847#############################################################################
2848
2849package CFClient::UI::Menu; 3899package DC::UI::Menu;
2850 3900
2851our @ISA = CFClient::UI::FancyFrame::; 3901our @ISA = DC::UI::Toplevel::;
2852 3902
2853use CFClient::OpenGL; 3903use DC::OpenGL;
2854 3904
2855sub new { 3905sub new {
2856 my $class = shift; 3906 my $class = shift;
2857 3907
2858 my $self = $class->SUPER::new ( 3908 my $self = $class->SUPER::new (
2859 items => [], 3909 items => [],
2860 z => 100, 3910 z => 100,
2861 @_, 3911 @_,
2862 ); 3912 );
2863 3913
2864 $self->add ($self->{vbox} = new CFClient::UI::VBox); 3914 $self->add ($self->{vbox} = new DC::UI::VBox);
2865 3915
2866 for my $item (@{ $self->{items} }) { 3916 for my $item (@{ $self->{items} }) {
2867 my ($widget, $cb) = @$item; 3917 my ($widget, $cb, $tooltip) = @$item;
2868 3918
2869 # handle various types of items, only text for now 3919 # handle various types of items, only text for now
2870 if (!ref $widget) { 3920 if (!ref $widget) {
3921 if ($widget =~ /\t/) {
3922 my ($left, $right) = split /\t/, $widget, 2;
3923
2871 $widget = new CFClient::UI::Label 3924 $widget = new DC::UI::HBox
2872 can_hover => 1, 3925 can_hover => 1,
2873 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,
2874 text => $widget; 3939 markup => $widget,
3940 tooltip => $tooltip;
3941 }
2875 } 3942 }
2876 3943
2877 $self->{item}{$widget} = $item; 3944 $self->{item}{$widget} = $item;
2878 3945
2879 $self->{vbox}->add ($widget); 3946 $self->{vbox}->add ($widget);
… …
2884 3951
2885# popup given the event (must be a mouse button down event currently) 3952# popup given the event (must be a mouse button down event currently)
2886sub popup { 3953sub popup {
2887 my ($self, $ev) = @_; 3954 my ($self, $ev) = @_;
2888 3955
2889 $self->_emit ("popdown"); 3956 $self->emit ("popdown");
2890 3957
2891 # maybe save $GRAB? must be careful about events... 3958 # maybe save $GRAB? must be careful about events...
2892 $GRAB = $self; 3959 $GRAB = $self;
2893 $self->{button} = $ev->{button}; 3960 $self->{button} = $ev->{button};
2894 3961
2895 $self->show; 3962 $self->show;
2896 $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
2897}
2898 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
2899sub mouse_motion { 3974sub invoke_mouse_motion {
2900 my ($self, $ev, $x, $y) = @_; 3975 my ($self, $ev, $x, $y) = @_;
2901 3976
2902 # TODO: should use vbox->find_widget or so 3977 # TODO: should use vbox->find_widget or so
2903 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y}); 3978 $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
2904 $self->{hover} = $self->{item}{$HOVER}; 3979 $self->{hover} = $self->{item}{$HOVER};
2905}
2906 3980
3981 0
3982}
3983
2907sub button_up { 3984sub invoke_button_up {
2908 my ($self, $ev, $x, $y) = @_; 3985 my ($self, $ev, $x, $y) = @_;
2909 3986
2910 if ($ev->{button} == $self->{button}) { 3987 if ($ev->{button} == $self->{button}) {
2911 undef $GRAB; 3988 undef $GRAB;
2912 $self->hide; 3989 $self->hide;
2913 3990
2914 $self->_emit ("popdown"); 3991 $self->emit ("popdown");
2915 $self->{hover}[1]->() if $self->{hover}; 3992 $self->{hover}[1]->() if $self->{hover};
3993 } else {
3994 return 0
3995 }
3996
2916 } 3997 1
2917} 3998}
2918 3999
2919############################################################################# 4000#############################################################################
2920 4001
2921package CFClient::UI::Statusbox; 4002package DC::UI::Multiplexer;
2922 4003
2923our @ISA = CFClient::UI::VBox::; 4004our @ISA = DC::UI::Container::;
2924 4005
2925sub new { 4006sub new {
2926 my $class = shift; 4007 my $class = shift;
2927 4008
2928 $class->SUPER::new ( 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
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 (
2929 fontsize => 0.8, 4284 fontsize => 0.8,
2930 @_, 4285 @_,
2931 ) 4286 );
4287
4288 DC::weaken (my $this = $self);
4289
4290 $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4291
4292 $self
2932} 4293}
2933 4294
2934sub reorder { 4295sub reorder {
2935 my ($self) = @_; 4296 my ($self) = @_;
2936 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} };
2937 4303
2938 while (my ($k, $v) = each %{ $self->{item} }) { 4304 while (my ($k, $v) = each %{ $self->{item} }) {
2939 delete $self->{item}{$k} if $v->{timeout} < $NOW; 4305 delete $self->{item}{$k} if $v->{timeout} < $NOW;
2940 } 4306 }
4307
4308 $self->{timer}->set (1, 1);
2941 4309
2942 my @widgets; 4310 my @widgets;
2943 4311
2944 my @items = sort { 4312 my @items = sort {
2945 $a->{pri} <=> $b->{pri} 4313 $a->{pri} <=> $b->{pri}
… …
2948 4316
2949 my $count = 10 + 1; 4317 my $count = 10 + 1;
2950 for my $item (@items) { 4318 for my $item (@items) {
2951 last unless --$count; 4319 last unless --$count;
2952 4320
2953 push @widgets, $item->{label} ||= do { 4321 my $label = $item->{label} ||= do {
2954 # TODO: doesn't handle markup well (read as: at all) 4322 # TODO: doesn't handle markup well (read as: at all)
2955 my $short = $item->{count} > 1 4323 my $short = $item->{count} > 1
2956 ? "<b>$item->{count} ×</b> $item->{text}" 4324 ? "<b>$item->{count} ×</b> $item->{text}"
2957 : $item->{text}; 4325 : $item->{text};
2958 4326
2959 for ($short) { 4327 for ($short) {
2960 s/^\s+//; 4328 s/^\s+//;
2961 s/\s+/ /g; 4329 s/\s+/ /g;
2962 } 4330 }
2963 4331
2964 new CFClient::UI::Label 4332 new DC::UI::Label
2965 markup => $short, 4333 markup => $short,
2966 tooltip => $item->{tooltip}, 4334 tooltip => $item->{tooltip},
2967 tooltip_font => $::FONT_PROP, 4335 tooltip_font => $::FONT_PROP,
2968 tooltip_width => 0.67, 4336 tooltip_width => 0.67,
2969 fontsize => $item->{fontsize} || $self->{fontsize}, 4337 fontsize => $item->{fontsize} || $self->{fontsize},
2970 max_w => $::WIDTH * 0.44, 4338 max_w => $::WIDTH * 0.44,
4339 align => 0,
2971 fg => $item->{fg}, 4340 fg => [@{ $item->{fg} }],
2972 can_events => 1, 4341 can_events => 1,
2973 can_hover => 1 4342 can_hover => 1
2974 }; 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;
2975 } 4356 }
4357
4358 my $hash = join ",", @widgets;
4359 return if $hash eq $self->{last_widget_hash};
4360 $self->{last_widget_hash} = $hash;
2976 4361
2977 $self->clear; 4362 $self->clear;
2978 $self->SUPER::add (reverse @widgets); 4363 $self->SUPER::add (reverse @widgets);
2979} 4364}
2980 4365
… …
2984 $text =~ s/^\s+//; 4369 $text =~ s/^\s+//;
2985 $text =~ s/\s+$//; 4370 $text =~ s/\s+$//;
2986 4371
2987 return unless $text; 4372 return unless $text;
2988 4373
2989 my $timeout = time + ((delete $arg{timeout}) || 60); 4374 my $timeout = (int time) + ((delete $arg{timeout}) || 60);
2990 4375
2991 my $group = exists $arg{group} ? $arg{group} : ++$self->{id}; 4376 my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
2992 4377
2993 if (my $item = $self->{item}{$group}) { 4378 if (my $item = $self->{item}{$group}) {
2994 if ($item->{text} eq $text) { 4379 if ($item->{text} eq $text) {
2995 $item->{count}++; 4380 $item->{count}++;
2996 } else { 4381 } else {
2997 $item->{count} = 1; 4382 $item->{count} = 1;
2998 $item->{text} = $item->{tooltip} = $text; 4383 $item->{text} = $item->{tooltip} = $text;
2999 } 4384 }
3000 $item->{id} = ++$self->{id}; 4385 $item->{id} += 0.2;#d#
3001 $item->{timeout} = $timeout; 4386 $item->{timeout} = $timeout;
3002 delete $item->{label}; 4387 delete $item->{label};
3003 } else { 4388 } else {
3004 $self->{item}{$group} = { 4389 $self->{item}{$group} = {
3005 id => ++$self->{id}, 4390 id => ++$self->{id},
… …
3011 count => 1, 4396 count => 1,
3012 %arg, 4397 %arg,
3013 }; 4398 };
3014 } 4399 }
3015 4400
4401 $ROOT->on_refresh (reorder => sub {
3016 $self->reorder; 4402 $self->reorder;
4403 });
3017} 4404}
3018 4405
3019sub reconfigure { 4406sub reconfigure {
3020 my ($self) = @_; 4407 my ($self) = @_;
3021 4408
… …
3024 4411
3025 $self->reorder; 4412 $self->reorder;
3026 $self->SUPER::reconfigure; 4413 $self->SUPER::reconfigure;
3027} 4414}
3028 4415
4416sub destroy {
4417 my ($self) = @_;
4418
4419 $self->{timer}->cancel;
4420
4421 $self->SUPER::destroy;
4422}
4423
3029############################################################################# 4424#############################################################################
3030 4425
3031package CFClient::UI::Root; 4426package DC::UI::Root;
3032 4427
3033our @ISA = CFClient::UI::Container::; 4428our @ISA = DC::UI::Container::;
3034 4429
4430use List::Util qw(min max);
4431
3035use CFClient::OpenGL; 4432use DC::OpenGL;
3036 4433
3037sub new { 4434sub new {
3038 my $class = shift; 4435 my $class = shift;
3039 4436
3040 $class->SUPER::new ( 4437 my $self = $class->SUPER::new (
4438 visible => 1,
3041 @_, 4439 @_,
3042 ) 4440 );
3043}
3044 4441
3045sub configure { 4442 DC::weaken ($self->{root} = $self);
3046 my ($self, $x, $y, $w, $h) = @_;
3047 4443
3048 $self->{w} = $w; 4444 $self
3049 $self->{h} = $h;
3050}
3051
3052sub check_size {
3053 my ($self) = @_;
3054
3055 $self->size_allocate ($self->{w}, $self->{h})
3056 if $self->{w};
3057} 4445}
3058 4446
3059sub size_request { 4447sub size_request {
3060 my ($self) = @_; 4448 my ($self) = @_;
3061 4449
3062 ($self->{w}, $self->{h}) 4450 ($self->{w}, $self->{h})
3063} 4451}
3064 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
3065sub size_allocate { 4467sub invoke_size_allocate {
3066 my ($self, $w, $h) = @_; 4468 my ($self, $w, $h) = @_;
3067 4469
3068 for my $child ($self->children) { 4470 for my $child ($self->children) {
3069 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)};
3070 4472
3071 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 4473 $X = $child->{force_x} if exists $child->{force_x};
3072 if exists $child->{req_x}; 4474 $Y = $child->{force_y} if exists $child->{force_y};
3073 4475
3074 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 4476 $X = _to_pixel $X, $W, $self->{w};
3075 if exists $child->{req_y}; 4477 $Y = _to_pixel $Y, $H, $self->{h};
3076
3077 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3078 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3079 4478
3080 $child->configure ($X, $Y, $W, $H); 4479 $child->configure ($X, $Y, $W, $H);
3081 } 4480 }
4481
4482 1
3082} 4483}
3083 4484
3084sub coord2local { 4485sub coord2local {
3085 my ($self, $x, $y) = @_; 4486 my ($self, $x, $y) = @_;
3086 4487
… …
3094} 4495}
3095 4496
3096sub update { 4497sub update {
3097 my ($self) = @_; 4498 my ($self) = @_;
3098 4499
3099 $self->check_size;
3100 $::WANT_REFRESH++; 4500 $::WANT_REFRESH = 1;
3101} 4501}
3102 4502
3103sub add { 4503sub add {
3104 my ($self, @children) = @_; 4504 my ($self, @children) = @_;
3105 4505
3106 for (my @widgets = @children; my $w = pop @widgets; ) {
3107 push @widgets, $w->children;
3108 $w->{root} = $self;
3109 $w->{visible} = 1;
3110 }
3111
3112 for my $child (@children) {
3113 $child->{is_toplevel} = 1; 4506 $_->{is_toplevel} = 1
3114 4507 for @children;
3115 # integerise window positions
3116 $child->{x} = int $child->{x};
3117 $child->{y} = int $child->{y};
3118 }
3119 4508
3120 $self->SUPER::add (@children); 4509 $self->SUPER::add (@children);
3121} 4510}
3122 4511
3123sub remove { 4512sub remove {
3124 my ($self, @children) = @_; 4513 my ($self, @children) = @_;
3125 4514
3126 $self->SUPER::remove (@children); 4515 $self->SUPER::remove (@children);
4516
4517 delete $self->{is_toplevel}
4518 for @children;
3127 4519
3128 while (@children) { 4520 while (@children) {
3129 my $w = pop @children; 4521 my $w = pop @children;
3130 push @children, $w->children; 4522 push @children, $w->children;
3131 $w->set_invisible; 4523 $w->set_invisible;
… …
3150 while ($self->{refresh_hook}) { 4542 while ($self->{refresh_hook}) {
3151 $_->() 4543 $_->()
3152 for values %{delete $self->{refresh_hook}}; 4544 for values %{delete $self->{refresh_hook}};
3153 } 4545 }
3154 4546
3155 if ($self->{check_size}) { 4547 while ($self->{realloc}) {
3156 my @queue = ([], []); 4548 my %queue;
4549 my @queue;
4550 my $widget;
3157 4551
3158 for (;;) { 4552 outer:
3159 if ($self->{check_size}) { 4553 while () {
3160 # heuristic: check containers last 4554 if (my $realloc = delete $self->{realloc}) {
3161 push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_ 4555 for $widget (values %$realloc) {
3162 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 }
3163 } 4562 }
3164 4563
3165 my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last; 4564 while () {
4565 @queue or last outer;
3166 4566
3167 my ($w, $h) = $widget->{user_w} && $widget->{user_h} 4567 $widget = pop @{ $queue[-1] || [] }
3168 ? @$widget{qw(user_w user_h)} 4568 and last;
3169 : $widget->size_request;
3170
3171 if (delete $widget->{force_alloc}
3172 or $w != $widget->{req_w} or $h != $widget->{req_h}) {
3173 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
3174 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}) {
3175 $widget->{req_w} = $w; 4591 $widget->{req_w} = $w;
3176 $widget->{req_h} = $h; 4592 $widget->{req_h} = $h;
3177 4593
3178 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 4594 $self->{size_alloc}{$widget+0} = $widget;
3179 4595
3180 $widget->{parent}->check_size
3181 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 }
3182 } 4603 }
4604
4605 delete $self->{realloc}{$widget+0};
3183 } 4606 }
3184 }
3185 4607
3186 while ($self->{size_alloc}) { 4608 while (my $size_alloc = delete $self->{size_alloc}) {
3187 for (values %{delete $self->{size_alloc}}) { 4609 my @queue = sort { $a->{visible} <=> $b->{visible} }
3188 my ($widget, $w, $h) = @$_; 4610 values %$size_alloc;
3189 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
3190 $w = 0 if $w < 0; 4626 $w = int $w + 0.5;
3191 $h = 0 if $h < 0; 4627 $h = int $h + 0.5;
3192 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
3193 $widget->{w} = $w; 4633 $widget->{w} = $w;
3194 $widget->{h} = $h; 4634 $widget->{h} = $h;
4635
3195 $widget->emit (size_allocate => $w, $h); 4636 $widget->emit (size_allocate => $w, $h);
4637 }
4638 }
3196 } 4639 }
3197 } 4640 }
3198 4641
3199 while ($self->{post_alloc_hook}) { 4642 while ($self->{post_alloc_hook}) {
3200 $_->() 4643 $_->()
… …
3209 glLoadIdentity; 4652 glLoadIdentity;
3210 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000; 4653 glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3211 glMatrixMode GL_MODELVIEW; 4654 glMatrixMode GL_MODELVIEW;
3212 glLoadIdentity; 4655 glLoadIdentity;
3213 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
3214 $self->_draw; 4663 $self->_draw;
4664 }
3215} 4665}
3216 4666
3217############################################################################# 4667#############################################################################
3218 4668
3219package CFClient::UI; 4669package DC::UI;
3220 4670
3221$ROOT = new CFClient::UI::Root; 4671$ROOT = new DC::UI::Root;
3222$TOOLTIP = new CFClient::UI::Tooltip z => 900; 4672$TOOLTIP = new DC::UI::Tooltip z => 900;
3223 4673
32241 46741
3225

Diff Legend

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