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.56 by root, Mon Apr 10 22:16:34 2006 UTC vs.
Revision 1.91 by root, Wed Apr 12 23:15:39 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::UI;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util ();
6use List::Util ();
6 7
7use SDL::OpenGL; 8use CFClient;
8use SDL::OpenGL::Constants;
9
10use Crossfire::Client;
11 9
12our ($FOCUS, $HOVER, $GRAB); # various widgets 10our ($FOCUS, $HOVER, $GRAB); # various widgets
13 11
14our $TOPLEVEL; 12our $TOPLEVEL;
15our $BUTTON_STATE; 13our $BUTTON_STATE;
… …
34 $GRAB->update if $GRAB; 32 $GRAB->update if $GRAB;
35 } 33 }
36 34
37 $BUTTON_STATE |= 1 << ($ev->button - 1); 35 $BUTTON_STATE |= 1 << ($ev->button - 1);
38 36
39 $GRAB->button_down ($ev) if $GRAB; 37 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40} 38}
41 39
42sub feed_sdl_button_up_event { 40sub feed_sdl_button_up_event {
43 my ($ev) = @_; 41 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y); 42 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45 43
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y); 44 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47 45
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1)); 46 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
47
48 $GRAB->button_up ($ev, $GRAB->translate ($x, $y)) if $GRAB;
49 49
50 if (!$BUTTON_STATE) { 50 if (!$BUTTON_STATE) {
51 my $grab = $GRAB; undef $GRAB; 51 my $grab = $GRAB; undef $GRAB;
52 $grab->update if $grab; 52 $grab->update if $grab;
53 $GRAB->update if $GRAB; 53 $GRAB->update if $GRAB;
… …
65 65
66 $hover->update if $hover; 66 $hover->update if $hover;
67 $HOVER->update if $HOVER; 67 $HOVER->update if $HOVER;
68 } 68 }
69 69
70 $HOVER->mouse_motion ($ev) if $HOVER; 70 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
71} 71}
72
73#############################################################################
74
75package CFClient::UI::Base;
76
77use strict;
78
79use SDL::OpenGL;
72 80
73sub new { 81sub new {
74 my $class = shift; 82 my $class = shift;
75 83
76 bless { @_ }, $class 84 my $self = bless {
85 x => 0,
86 y => 0,
87 z => 0,
88 w => -1,
89 h => -1,
90 @_
91 }, $class;
92
93 for (keys %$self) {
94 if (/^connect_(.*)$/) {
95 $self->connect ($1 => delete $self->{$_});
96 }
97 }
98
99 $self
77} 100}
78 101
79sub move { 102sub move {
80 my ($self, $x, $y, $z) = @_; 103 my ($self, $x, $y, $z) = @_;
81 $self->{x} = $x; 104 $self->{x} = $x;
… …
90sub size_request { 113sub size_request {
91 require Carp; 114 require Carp;
92 Carp::confess "size_request is abtract"; 115 Carp::confess "size_request is abtract";
93} 116}
94 117
95sub size_allocate { 118sub _size_allocate {
96 my ($self, $w, $h) = @_; 119 my ($self, $x, $y, $w, $h) = @_;
120
121 $self->{x} = $x;
122 $self->{y} = $y;
123
124 return unless $self->{w} != $w || $self->{h} != $h;
97 125
98 $self->{w} = $w; 126 $self->{w} = $w;
99 $self->{h} = $h; 127 $self->{h} = $h;
128
129 1
130}
131
132sub size_allocate {
133 my ($self, $x, $y, $w, $h) = @_;
134
135 $self->_size_allocate ($x, $y, $w, $h);
136}
137
138# translate global coordinates to local coordinate system
139sub translate {
140 my ($self, $x, $y) = @_;
141
142 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
100} 143}
101 144
102sub focus_in { 145sub focus_in {
103 my ($self) = @_; 146 my ($self) = @_;
147
148 return if $FOCUS == $self;
104 149
105 my $focus = $FOCUS; $FOCUS = $self; 150 my $focus = $FOCUS; $FOCUS = $self;
106 $focus->update if $focus; 151 $focus->update if $focus;
107 $FOCUS->update; 152 $FOCUS->update;
108} 153}
… …
116 $focus->update if $focus; #? 161 $focus->update if $focus; #?
117} 162}
118 163
119sub mouse_motion { } 164sub mouse_motion { }
120sub button_up { } 165sub button_up { }
121sub button_down { }
122sub key_down { } 166sub key_down { }
123sub key_up { } 167sub key_up { }
168
169sub button_down {
170 my ($self, $ev, $x, $y) = @_;
171
172 $self->focus_in;
173}
124 174
125sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} } 175sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
126sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} } 176sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
127sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} } 177sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
128sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} } 178sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
129sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} } 179sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
130 180
131sub draw { 181sub draw {
132 my ($self) = @_; 182 my ($self) = @_;
133 183
184 return unless $self->{h} && $self->{w};
185
134 glPushMatrix; 186 glPushMatrix;
135 glTranslate $self->{x}, $self->{y}, 0; 187 glTranslate $self->{x}, $self->{y}, 0;
136 $self->_draw; 188 $self->_draw;
189 glPopMatrix;
190
137 if ($self == $HOVER) { 191 if ($self == $HOVER) {
138 glColor 1, 1, 1, 0.4; 192 my ($x, $y) = @$self{qw(x y)};
193
194 glColor 0, 0, 1, 0.2;
139 glEnable GL_BLEND; 195 glEnable GL_BLEND;
196 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
140 glBegin GL_QUADS; 197 glBegin GL_QUADS;
141 glVertex 0 , 0; 198 glVertex $x , $y;
142 glVertex $self->{w}, 0; 199 glVertex $x + $self->{w}, $y;
143 glVertex $self->{w}, $self->{h}; 200 glVertex $x + $self->{w}, $y + $self->{h};
144 glVertex 0 , $self->{h}; 201 glVertex $x , $y + $self->{h};
145 glEnd; 202 glEnd;
146 glDisable GL_BLEND; 203 glDisable GL_BLEND;
147 } 204 }
148 glPopMatrix;
149} 205}
150 206
151sub _draw { 207sub _draw {
152 my ($self) = @_; 208 my ($self) = @_;
153 209
154 warn "no draw defined for $self\n"; 210 warn "no draw defined for $self\n";
155}
156
157sub bbox {
158 my ($self) = @_;
159 my ($w, $h) = $self->size_request;
160 (
161 $self->{x},
162 $self->{y},
163 $self->{x} = $w,
164 $self->{y} = $h
165 )
166} 211}
167 212
168sub find_widget { 213sub find_widget {
169 my ($self, $x, $y) = @_; 214 my ($self, $x, $y) = @_;
170 215
… …
173 && $y >= $self->{y} && $y < $self->{y} + $self->{h}; 218 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
174 219
175 () 220 ()
176} 221}
177 222
178sub del_parent { $_[0]->{parent} = undef }
179
180sub set_parent { 223sub set_parent {
181 my ($self, $par) = @_; 224 my ($self, $par) = @_;
182 225
183 $self->{parent} = $par; 226 $self->{parent} = $par;
184 Scalar::Util::weaken $self->{parent}; 227 Scalar::Util::weaken $self->{parent};
… …
193 236
194 $self->{parent}->update 237 $self->{parent}->update
195 if $self->{parent}; 238 if $self->{parent};
196} 239}
197 240
241sub connect {
242 my ($self, $signal, $cb) = @_;
243
244 push @{ $self->{cb}{$signal} }, $cb;
245}
246
247sub emit {
248 my ($self, $signal, @args) = @_;
249
250 $_->($self, @args)
251 for @{$self->{cb}{$signal} || []};
252}
253
198sub DESTROY { 254sub DESTROY {
199 my ($self) = @_; 255 my ($self) = @_;
200 256
201 #$self->deactivate; 257 #$self->deactivate;
202} 258}
203 259
204############################################################################# 260#############################################################################
205 261
206package Crossfire::Client::Widget::Container; 262package CFClient::UI::DrawBG;
207 263
208our @ISA = Crossfire::Client::Widget::; 264our @ISA = CFClient::UI::Base::;
265
266use strict;
267use SDL::OpenGL;
209 268
210sub new { 269sub new {
270 my $class = shift;
271
272 # range [value, low, high, page]
273
274 $class->SUPER::new (
275 bg => [0, 0, 0, 0.2],
276 active_bg => [1, 1, 1, 0.5],
277 @_
278 )
279}
280
281sub _draw {
282 my ($self) = @_;
283
284 my ($w, $h) = @$self{qw(w h)};
285
286 glEnable GL_BLEND;
287 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
288 glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
289
290 glBegin GL_QUADS;
291 glVertex 0 , 0;
292 glVertex 0 , $h;
293 glVertex $w, $h;
294 glVertex $w, 0;
295 glEnd;
296
297 glDisable GL_BLEND;
298}
299
300#############################################################################
301
302package CFClient::UI::Empty;
303
304our @ISA = CFClient::UI::Base::;
305
306sub size_request {
307 (0, 0)
308}
309
310sub draw { }
311
312#############################################################################
313
314package CFClient::UI::Container;
315
316our @ISA = CFClient::UI::Base::;
317
318sub new {
211 my ($class, @widgets) = @_; 319 my ($class, %arg) = @_;
212 320
321 my $children = delete $arg{children} || [];
322
213 my $self = $class->SUPER::new (children => []); 323 my $self = $class->SUPER::new (children => [], %arg);
214 $self->add ($_) for @widgets; 324 $self->add ($_) for @$children;
215 325
216 $self 326 $self
217} 327}
218 328
219sub add { 329sub add {
220 my ($self, $chld, $expand) = @_; 330 my ($self, $chld) = @_;
221 331
222 $chld->{expand} = $expand;
223 $chld->set_parent ($self); 332 $chld->set_parent ($self);
224 333
225 @{$self->{children}} = 334 $self->{children} = [
226 sort { $a->{z} <=> $b->{z} } 335 sort { $a->{z} <=> $b->{z} }
227 @{$self->{children}}, $chld; 336 @{$self->{children}}, $chld
337 ];
228 338
229 $self->size_allocate ($self->{w}, $self->{h}) 339 $self->{w} = $self->{h} = -1;
230 if $self->{w}; #TODO: check for "realised state" 340 $self->update;
231} 341}
232 342
233sub remove { 343sub remove {
234 my ($self, $widget) = @_; 344 my ($self, $widget) = @_;
235 345
236 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ]; 346 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
237 347
238 $self->size_allocate ($self->{w}, $self->{h}); 348 $self->size_allocate (0, 0, $self->{w}, $self->{h});
239} 349}
240 350
241sub find_widget { 351sub find_widget {
242 my ($self, $x, $y) = @_; 352 my ($self, $x, $y) = @_;
243 353
… …
260 $_->draw for @{$self->{children}}; 370 $_->draw for @{$self->{children}};
261} 371}
262 372
263############################################################################# 373#############################################################################
264 374
265package Crossfire::Client::Widget::Bin; 375package CFClient::UI::Bin;
266 376
267our @ISA = Crossfire::Client::Widget::Container::; 377our @ISA = CFClient::UI::Container::;
378
379sub new {
380 my ($class, %arg) = @_;
381
382 my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
383
384 $class->SUPER::new (children => [$child], %arg)
385}
386
387sub add {
388 my ($self, $widget) = @_;
389
390 $self->{children} = [];
391
392 $self->SUPER::add ($widget);
393}
394
395sub remove {
396 my ($self, $widget) = @_;
397
398 $self->SUPER::remove ($widget);
399
400 $self->{children} = [new CFClient::UI::Empty]
401 unless @{$self->{children}};
402}
268 403
269sub child { $_[0]->{children}[0] } 404sub child { $_[0]->{children}[0] }
270 405
271sub size_request { 406sub size_request {
272 $_[0]{children}[0]->size_request if $_[0]{children}[0]; 407 $_[0]{children}[0]->size_request
273} 408}
274 409
275sub size_allocate { 410sub size_allocate {
276 my ($self, $w, $h) = @_; 411 my ($self, $x, $y, $w, $h) = @_;
277 412
278 $self->SUPER::size_allocate ($w, $h); 413 $self->_size_allocate ($x, $y, $w, $h) or return;
414
279 $self->{children}[0]->size_allocate ($w, $h) 415 $self->{children}[0]->size_allocate (0, 0, $w, $h);
280 if $self->{children}[0]
281} 416}
282 417
283############################################################################# 418#############################################################################
284 419
285package Crossfire::Client::Widget::Window; 420package CFClient::UI::Window;
286 421
287our @ISA = Crossfire::Client::Widget::Bin::; 422our @ISA = CFClient::UI::Bin::;
288 423
289use SDL::OpenGL; 424use SDL::OpenGL;
290 425
291sub new { 426sub new {
292 my ($class, $x, $y, $z, $w, $h) = @_; 427 my ($class, %arg) = @_;
293 428
294 my $self = $class->SUPER::new; 429 my $self = $class->SUPER::new (%arg);
295
296 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
297} 430}
298 431
299sub update { 432sub update {
300 my ($self) = @_; 433 my ($self) = @_;
301 434
435 # we want to do this delayed...
302 $self->render_chld; 436 $self->render_chld;
303 $self->SUPER::update; 437 $self->SUPER::update;
304} 438}
305 439
306sub render_chld { 440sub render_chld {
307 my ($self) = @_; 441 my ($self) = @_;
308 442
309 $self->{texture} = 443 $self->{texture} =
310 Crossfire::Client::Texture->new_from_opengl ( 444 CFClient::Texture->new_from_opengl (
311 $self->{w}, $self->{h}, sub { $self->child->draw } 445 $self->{w}, $self->{h}, sub { $self->child->draw }
312 ); 446 );
313} 447}
314 448
315sub size_allocate { 449sub size_allocate {
316 my ($self, $w, $h) = @_; 450 my ($self, $x, $y, $w, $h) = @_;
317 451
318 $self->{w} = $w; 452 $self->_size_allocate ($x, $y, $w, $h) or return;
319 $self->{h} = $h;
320 453
321 $self->child->size_allocate ($w, $h); 454 $self->child->size_allocate (0, 0, $w, $h);
322 455
323 $self->render_chld; 456 $self->render_chld;
324} 457}
325 458
326sub _draw { 459sub _draw {
… …
330 463
331 my $tex = $self->{texture} 464 my $tex = $self->{texture}
332 or return; 465 or return;
333 466
334 glEnable GL_BLEND; 467 glEnable GL_BLEND;
468 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glEnable GL_TEXTURE_2D; 469 glEnable GL_TEXTURE_2D;
336 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 470 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
337 471
338 $tex->draw_quad (0, 0, $w, $h); 472 $tex->draw_quad (0, 0, $w, $h);
339 473
… …
341 glDisable GL_TEXTURE_2D; 475 glDisable GL_TEXTURE_2D;
342} 476}
343 477
344############################################################################# 478#############################################################################
345 479
346package Crossfire::Client::Widget::Frame; 480package CFClient::UI::Frame;
347 481
348our @ISA = Crossfire::Client::Widget::Bin::; 482our @ISA = CFClient::UI::Bin::;
349 483
350use SDL::OpenGL; 484use SDL::OpenGL;
351 485
352sub size_request { 486sub size_request {
353 my ($self) = @_; 487 my ($self) = @_;
… …
358 492
359 map { $_ + 4 } $chld->size_request; 493 map { $_ + 4 } $chld->size_request;
360} 494}
361 495
362sub size_allocate { 496sub size_allocate {
363 my ($self, $w, $h) = @_; 497 my ($self, $x, $y, $w, $h) = @_;
364 498
365 $self->{w} = $w; 499 $self->_size_allocate ($x, $y, $w, $h) or return;
366 $self->{h} = $h;
367 500
368 $self->child->size_allocate ($w - 4, $h - 4); 501 $self->child->size_allocate (2, 2, $w - 4, $h - 4);
369 $self->child->move (2, 2);
370} 502}
371 503
372sub _draw { 504sub _draw {
373 my ($self) = @_; 505 my ($self) = @_;
374 506
… …
387 $chld->draw; 519 $chld->draw;
388} 520}
389 521
390############################################################################# 522#############################################################################
391 523
392package Crossfire::Client::Widget::FancyFrame; 524package CFClient::UI::FancyFrame;
393 525
394our @ISA = Crossfire::Client::Widget::Bin::; 526our @ISA = CFClient::UI::Bin::;
395 527
396use SDL::OpenGL; 528use SDL::OpenGL;
397 529
398my @tex = 530my @tex =
399 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 531 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
400 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 532 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
401 533
402sub size_request { 534sub size_request {
403 my ($self) = @_; 535 my ($self) = @_;
404 536
537 return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
538
405 my ($w, $h) = $self->SUPER::size_request; 539 my ($w, $h) = $self->SUPER::size_request;
406 540
407 $h += $tex[1]->{height}; 541 $h += $tex[1]->{h};
408 $h += $tex[4]->{height}; 542 $h += $tex[4]->{h};
409 $w += $tex[2]->{width}; 543 $w += $tex[2]->{w};
410 $w += $tex[3]->{width}; 544 $w += $tex[3]->{w};
411 545
412 ($w, $h) 546 ($w, $h)
413} 547}
414 548
415sub size_allocate { 549sub size_allocate {
416 my ($self, $w, $h) = @_; 550 my ($self, $x, $y, $w, $h) = @_;
417 551
418 $self->SUPER::size_allocate ($w, $h); 552 $self->_size_allocate ($x, $y, $w, $h) or return;
419 553
420 $h -= $tex[1]->{height}; 554 $h -= $tex[1]{h};
421 $h -= $tex[4]->{height}; 555 $h -= $tex[4]{h};
422 $w -= $tex[2]->{width}; 556 $w -= $tex[2]{w};
423 $w -= $tex[3]->{width}; 557 $w -= $tex[3]{w};
424 558
425 $h = $h < 0 ? 0 : $h; 559 $h = $h < 0 ? 0 : $h;
426 $w = $w < 0 ? 0 : $w; 560 $w = $w < 0 ? 0 : $w;
427 561
428 $self->child->size_allocate ($w, $h); 562 my $child = $self->child;
429 $self->child->move ($tex[3]->{width}, $tex[1]->{height}); 563
564 $child->size_allocate ($tex[3]->{w}, $tex[1]->{h}, $w, $h);
565}
566
567sub button_down {
568 my ($self, $ev, $x, $y) = @_;
569
570 if ($x < $self->{w} && $x >= $self->{w} - $tex[2]{w}
571 && $y < $self->{h} && $y >= $self->{h} - $tex[4]{h}) {
572
573 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
574 my ($bw, $bh) = ($self->{w}, $self->{h});
575
576 $self->{motion} = sub {
577 my ($ev, $x, $y) = @_;
578
579 ($x, $y) = ($ev->motion_x, $ev->motion_y);
580
581 $self->{user_w} = $bw + $x - $ox;
582 $self->{user_h} = $bh + $y - $oy;
583 $self->update;
584 };
585
586 } elsif ($x >= 0 && $x < $self->{w}
587 && $y >= 0 && $y < $tex[1]{h}) {
588
589 my ($ox, $oy) = ($ev->button_x, $ev->button_y);
590 my ($bx, $by) = ($self->{x}, $self->{y});
591
592 $self->{motion} = sub {
593 my ($ev, $x, $y) = @_;
594
595 ($x, $y) = ($ev->motion_x, $ev->motion_y);
596
597 $self->move ($bx + $x - $ox, $by + $y - $oy);
598 $self->update;
599 };
600 }
601}
602
603sub button_up {
604 my ($self, $ev, $x, $y) = @_;
605
606 delete $self->{motion};
607}
608
609sub mouse_motion {
610 my ($self, $ev, $x, $y) = @_;
611
612 $self->{motion}->($ev, $x, $y) if $self->{motion};
430} 613}
431 614
432sub _draw { 615sub _draw {
433 my ($self) = @_; 616 my ($self) = @_;
434 617
435 my ($w, $h) = ($self->{w}, $self->{h}); 618 my ($w, $h) = ($self->{w}, $self->{h});
436 my ($cw, $ch) = ($self->child->{w}, $self->child->{h}); 619 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
437 620
438 glEnable GL_BLEND; 621 glEnable GL_BLEND;
622 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
439 glEnable GL_TEXTURE_2D; 623 glEnable GL_TEXTURE_2D;
440 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
441 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 624 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
442 625
443 my $top = $tex[1]; 626 my $top = $tex[1];
444 $top->draw_quad (0, 0, $w, $top->{height}); 627 $top->draw_quad (0, 0, $w, $top->{h});
445 628
446 my $left = $tex[3]; 629 my $left = $tex[3];
447 $left->draw_quad (0, $top->{height}, $left->{width}, $ch); 630 $left->draw_quad (0, $top->{h}, $left->{w}, $ch);
448 631
449 my $right = $tex[2]; 632 my $right = $tex[2];
450 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch); 633 $right->draw_quad ($w - $right->{w}, $top->{h}, $right->{w}, $ch);
451 634
452 my $bottom = $tex[4]; 635 my $bottom = $tex[4];
453 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height}); 636 $bottom->draw_quad (0, $h - $bottom->{h}, $w, $bottom->{h});
454 637
455 my $bg = $tex[0]; 638 my $bg = $tex[0];
639
456 glBindTexture GL_TEXTURE_2D, $bg->{name}; 640 glBindTexture GL_TEXTURE_2D, $bg->{name};
457 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
458 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
460 642
461 my $rep_x = $cw / $bg->{width}; 643 my $rep_x = $cw / $bg->{w};
462 my $rep_y = $ch / $bg->{height}; 644 my $rep_y = $ch / $bg->{h};
463 645
464 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch); 646 $bg->draw_quad ($left->{w}, $top->{h}, $cw, $ch);
465 647
648 glDisable GL_TEXTURE_2D;
466 glDisable GL_BLEND; 649 glDisable GL_BLEND;
467 glDisable GL_TEXTURE_2D;
468 650
469 $self->child->draw; 651 $self->child->draw;
470 652
471} 653}
472 654
473############################################################################# 655#############################################################################
474 656
475package Crossfire::Client::Widget::Table; 657package CFClient::UI::Table;
476 658
477our @ISA = Crossfire::Client::Widget::Bin::; 659our @ISA = CFClient::UI::Base::;
660
661use List::Util qw(max sum);
478 662
479use SDL::OpenGL; 663use SDL::OpenGL;
664
665sub new {
666 my $class = shift;
667
668 $class->SUPER::new (
669 col_expand => [],
670 @_
671 )
672}
480 673
481sub add { 674sub add {
482 my ($self, $x, $y, $chld) = @_; 675 my ($self, $x, $y, $chld) = @_;
483 my $old_chld = $self->{children}[$y][$x];
484 676
485 $self->{children}[$y][$x] = $chld; 677 $self->{children}[$y][$x] = $chld;
486 $chld->set_parent ($self); 678 $chld->set_parent ($self);
679
680 $self->{w} = $self->{h} = -1;
487 $self->update; 681 $self->update;
488} 682}
489 683
490sub max_row_height { 684sub get_wh {
491 my ($self, $row) = @_; 685 my ($self) = @_;
492 686
493 my $hs = 0; 687 my (@w, @h);
494 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) { 688
689 for my $y (0 .. $#{$self->{children}}) {
495 my $c = $self->{children}->[$row]->[$xi]; 690 my $row = $self->{children}[$y]
496 if ($c) { 691 or next;
692
693 for my $x (0 .. $#$row) {
694 my $widget = $row->[$x]
695 or next;
497 my ($w, $h) = $c->size_request; 696 my ($w, $h) = $widget->size_request;
498 if ($hs < $h) { $hs = $h } 697
698 $w[$x] = max $w[$x], $w;
699 $h[$y] = max $h[$y], $h;
499 } 700 }
500 } 701 }
501 return $hs;
502}
503 702
504sub max_col_width { 703 (\@w, \@h)
704}
705
706sub size_request {
505 my ($self, $col) = @_; 707 my ($self) = @_;
506 708
709 my ($ws, $hs) = $self->get_wh;
710
711 (
712 (sum @$ws),
713 (sum @$hs),
714 )
715}
716
717sub size_allocate {
718 my ($self, $x, $y, $w, $h) = @_;
719
720 $self->_size_allocate ($x, $y, $w, $h) or return;
721
722 my ($ws, $hs) = $self->get_wh;
723
724 my $req_w = sum @$ws;
725 my $req_h = sum @$hs;
726
727 # TODO: nicer code && do row_expand
728 my @col_expand = @{$self->{col_expand}};
729 @col_expand = (1) x @$ws unless @col_expand;
730 my $col_expand = (sum @col_expand) || 1;
731
732 # linearly scale sizes
733 $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
734 $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
735
736 my $y;
737
738 for my $r (0 .. $#{$self->{children}}) {
739 my $row = $self->{children}[$r]
740 or next;
741
507 my $ws = 0; 742 my $x = 0;
508 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) { 743 my $row_h = $hs->[$r];
509 my $c = ($self->{children}->[$yi] || [])->[$col]; 744
510 if ($c) { 745 for my $c (0 .. $#$row) {
511 my ($w, $h) = $c->size_request; 746 my $col_w = $ws->[$c];
512 if ($ws < $w) { $ws = $w } 747
748 if (my $widget = $row->[$c]) {
749 $widget->size_allocate ($x, $y, $col_w, $row_h);
750 }
751
752 $x += $col_w;
513 } 753 }
754
755 $y += $row_h;
514 } 756 }
515 return $ws; 757
516} 758}
759
760sub find_widget {
761 my ($self, $x, $y) = @_;
762
763 $x -= $self->{x};
764 $y -= $self->{y};
765
766 my $res;
767
768 for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
769 $res = $_->find_widget ($x, $y)
770 and return $res;
771 }
772
773 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
774}
775
776sub _draw {
777 my ($self) = @_;
778
779 for (grep $_, @{$self->{children}}) {
780 $_->draw for grep $_, @$_;
781 }
782}
783
784#############################################################################
785
786package CFClient::UI::HBox;
787
788# TODO: wrap into common Box base class
789
790our @ISA = CFClient::UI::Container::;
517 791
518sub size_request { 792sub size_request {
519 my ($self) = @_; 793 my ($self) = @_;
520 794
795 my @alloc = map [$_->size_request], @{$self->{children}};
796
797 (
798 (List::Util::sum map $_->[0], @alloc),
799 (List::Util::max map $_->[1], @alloc),
800 )
801}
802
803sub size_allocate {
804 my ($self, $x, $y, $w, $h) = @_;
805
806 $self->_size_allocate ($x, $y, $w, $h);
807
521 my ($hs, $ws) = (0, 0); 808 ($h, $w) = ($w, $h);
522 809
523 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 810 my $children = $self->{children};
524 $hs += $self->max_row_height ($yi);
525 }
526 811
527 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 812 my @h = map +($_->size_request)[0], @$children;
528 my $wm = 0; 813
529 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 814 my $req_h = List::Util::sum @h;
530 $wm += $self->max_col_width ($xi) 815
816 if ($req_h > $h) {
817 # ah well, not enough space
818 $_ *= $h / $req_h for @h;
819 } else {
820 my $exp = List::Util::sum map $_->{expand}, @$children;
821 $exp ||= 1;
822
823 for (0 .. $#$children) {
824 my $child = $children->[$_];
825
826 my $alloc_h = $h[$_];
827 $alloc_h += ($h - $req_h) * $child->{expand} / $exp;
828 $h[$_] = $alloc_h;
531 } 829 }
532 if ($ws < $wm) { $ws = $wm }
533 } 830 }
534
535 return ($ws, $hs);
536}
537
538sub _draw {
539 my ($self) = @_;
540 831
541 my $y = 0; 832 my $y = 0;
542 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) { 833 for (0 .. $#$children) {
834 my $child = $children->[$_];
543 my $x = 0; 835 my $h = $h[$_];
836 $child->size_allocate ($y, 0, $h, $w);
544 837
545 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) { 838 $y += $h;
546
547 my $c = $self->{children}->[$yi]->[$xi];
548 if ($c) {
549 $c->move ($x, $y, 0); #TODO: Move to size_request
550 $c->draw if $c;
551 }
552
553 $x += $self->max_col_width ($xi);
554 }
555
556 $y += $self->max_row_height ($yi);
557 } 839 }
558} 840}
559 841
560############################################################################# 842#############################################################################
561 843
562package Crossfire::Client::Widget::VBox; 844package CFClient::UI::VBox;
563 845
846# TODO: wrap into common Box base class
847
564our @ISA = Crossfire::Client::Widget::Container::; 848our @ISA = CFClient::UI::Container::;
565
566use SDL::OpenGL;
567 849
568sub size_request { 850sub size_request {
569 my ($self) = @_; 851 my ($self) = @_;
570 852
571 my @alloc = map [$_->size_request], @{$self->{children}}; 853 my @alloc = map [$_->size_request], @{$self->{children}};
… …
575 (List::Util::sum map $_->[1], @alloc), 857 (List::Util::sum map $_->[1], @alloc),
576 ) 858 )
577} 859}
578 860
579sub size_allocate { 861sub size_allocate {
580 my ($self, $w, $h) = @_; 862 my ($self, $x, $y, $w, $h) = @_;
581 863
582 $self->w ($w); 864 $self->_size_allocate ($x, $y, $w, $h);
583 $self->h ($h);
584 865
585 my $exp; 866 my $children = $self->{children};
586 my @oth; 867
587 # find expand widget 868 my @h = map +($_->size_request)[1], @$children;
588 for (@{$self->{children}}) { 869
589 if ($_->{expand}) { 870 my $req_h = List::Util::sum @h;
871
872 if ($req_h > $h) {
873 # ah well, not enough space
874 $_ *= $h / $req_h for @h;
875 } else {
876 my $exp = List::Util::sum map $_->{expand}, @$children;
590 $exp = $_; 877 $exp ||= 1;
591 last; 878
879 for (0 .. $#$children) {
880 my $child = $children->[$_];
881
882 $h[$_] += ($h - $req_h) * $child->{expand} / $exp;
592 } 883 }
593 push @oth, $_;
594 }
595
596 my ($ow, $oh);
597
598 # get sizes of other widgets
599 for (@oth) {
600 my ($w, $h) = $_->size_request;
601 $oh += $h;
602 if ($ow < $w) { $ow = $w }
603 } 884 }
604 885
605 my $y = 0; 886 my $y = 0;
606 for (@{$self->{children}}) { 887 for (0 .. $#$children) {
607 $_->move (0, $y); 888 my $child = $children->[$_];
608 889 my $h = $h[$_];
609 if ($_ == $exp) {
610 $_->size_allocate ($w, $h - $oh);
611 $y += $h - $oh;
612 } else {
613 my ($cw, $h) = $_->size_request;
614 $_->size_allocate ($w, $h); 890 $child->size_allocate (0, $y, $w, $h);
891
615 $y += $h; 892 $y += $h;
616 }
617 } 893 }
618} 894}
619 895
620############################################################################# 896#############################################################################
621 897
622package Crossfire::Client::Widget::Label; 898package CFClient::UI::Label;
623 899
624our @ISA = Crossfire::Client::Widget::; 900our @ISA = CFClient::UI::Base::;
625 901
626use SDL::OpenGL; 902use SDL::OpenGL;
627 903
628sub new { 904sub new {
629 my ($class, $x, $y, $z, $height, $text) = @_; 905 my ($class, %arg) = @_;
630 906
907 my $self = $class->SUPER::new (
908 fg => [1, 1, 1],
631 $height ||= $::FONTSIZE; 909 height => $::FONTSIZE,
910 text => "",
911 align => -1,
912 padding => 2,
913 layout => new CFClient::Layout,
914 %arg
915 );
632 916
633 # TODO: color, and make height, xyz etc. optional
634 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
635
636 $self->set_text ($text); 917 $self->set_text ($self->{text});
637 918
638 $self 919 $self
920}
921
922sub escape_text {
923 local $_ = $_[1];
924
925 s/&/&amp;/g;
926 s/>/&gt;/g;
927 s/</&lt;/g;
928
929 $_[1]
639} 930}
640 931
641sub set_text { 932sub set_text {
642 my ($self, $text) = @_; 933 my ($self, $text) = @_;
643 934
644 $self->{text} = $text; 935 $self->{text} = $text;
645 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 936 $self->{layout}->set_markup ($text);
646 937
938 delete $self->{texture};
939# $self->{w} = $self->{h} = -1;
647 $self->update; 940 $self->update;
648} 941}
649 942
650sub get_text { 943sub get_text {
651 my ($self, $text) = @_; 944 my ($self, $text) = @_;
… …
654} 947}
655 948
656sub size_request { 949sub size_request {
657 my ($self) = @_; 950 my ($self) = @_;
658 951
659 if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack 952 $self->{layout}->set_width;
953 $self->{layout}->set_height ($self->{height});
954 my ($w, $h) = $self->{layout}->size;
955
956 (
957 $w + $self->{padding} * 2,
958 $h + $self->{padding} * 2,
959 )
960}
961
962sub size_allocate {
963 my ($self, $x, $y, $w, $h) = @_;
964
965 $self->_size_allocate ($x, $y, $w, $h) or return;
966
967 delete $self->{texture};
968}
969
970sub update {
971 my ($self) = @_;
972
973 delete $self->{texture};
974 $self->SUPER::update;
975}
976
977sub _draw {
978 my ($self) = @_;
979
980 my $tex = $self->{texture} ||= do {
981 $self->{layout}->set_width ($self->{w});
982 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
983 new_from_layout CFClient::Texture $self->{layout}
984 };
985
986 glEnable GL_BLEND;
987 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
988 glEnable GL_TEXTURE_2D;
989 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
990
991 glColor @{$self->{fg}};
992
993 my $x =
994 $self->{align} < 0 ? $self->{padding}
995 : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
996 : ($self->{w} - $tex->{w}) * 0.5;
997
998 glTranslate $x, ($self->{h} - $tex->{h}) * 0.5, 0;
999 $tex->draw_quad (0, 0);
1000
1001 glDisable GL_TEXTURE_2D;
1002 glDisable GL_BLEND;
1003}
1004
1005#############################################################################
1006
1007package CFClient::UI::Entry;
1008
1009our @ISA = CFClient::UI::Label::;
1010
1011use SDL;
1012use SDL::OpenGL;
1013
1014sub new {
1015 my $class = shift;
1016
1017 $class->SUPER::new (
1018 fg => [1, 1, 1],
1019 bg => [0, 0, 0, 0.2],
1020 active_bg => [1, 1, 1, 0.5],
1021 active_fg => [0, 0, 0],
660 ( 1022 @_
661 $self->{texture}{width}, 1023 )
662 $self->{texture}{height}, 1024}
663 ) 1025
1026sub _set_text {
1027 my ($self, $text) = @_;
1028
1029 $self->{last_activity} = $::NOW;
1030
1031 $self->{text} = $text;
1032 $self->{layout}->set_width ($self->{w});
1033 $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
1034
1035 $text =~ s/./*/g if $self->{hidden};
1036
1037 $self->{layout}->set_markup ($self->escape_text ($text) . " ");
1038
1039 $text = substr $text, 0, $self->{cursor};
1040 utf8::encode $text;
1041
1042 @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1043}
1044
1045sub size_request {
1046 my ($self) = @_;
1047
1048 my ($w, $h) = $self->SUPER::size_request;
1049
1050 ($w + 1, $h) # add 1 for cursor
1051}
1052
1053sub size_allocate {
1054 my ($self, $x, $y, $w, $h) = @_;
1055
1056 $self->SUPER::size_allocate ($x, $y, $w, $h);
1057
1058 $self->_set_text ($self->{text});
1059}
1060
1061sub set_text {
1062 my ($self, $text) = @_;
1063
1064 $self->{cursor} = length $text;
1065 $self->_set_text ($text);
1066 $self->update;
1067}
1068
1069sub key_down {
1070 my ($self, $ev) = @_;
1071
1072 my $mod = $ev->key_mod;
1073 my $sym = $ev->key_sym;
1074
1075 my $uni = $ev->key_unicode;
1076
1077 my $text = $self->get_text;
1078
1079 if ($sym == SDLK_BACKSPACE) {
1080 substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1081 } elsif ($sym == SDLK_DELETE) {
1082 substr $text, $self->{cursor}, 1, "";
1083 } elsif ($sym == SDLK_LEFT) {
1084 --$self->{cursor} if $self->{cursor};
1085 } elsif ($sym == SDLK_RIGHT) {
1086 ++$self->{cursor} if $self->{cursor} < length $self->{text};
1087 } elsif ($sym == SDLK_HOME) {
1088 $self->{cursor} = 0;
1089 } elsif ($sym == SDLK_END) {
1090 $self->{cursor} = length $text;
1091 } elsif ($uni) {
1092 substr $text, $self->{cursor}++, 0, chr $uni;
1093 }
1094
1095 $self->_set_text ($text);
1096 $self->update;
1097}
1098
1099sub focus_in {
1100 my ($self) = @_;
1101
1102 $self->{last_activity} = $::NOW;
1103
1104 $self->SUPER::focus_in;
1105}
1106
1107sub button_down {
1108 my ($self, $ev, $x, $y) = @_;
1109
1110 $self->SUPER::button_down ($ev, $x, $y);
1111
1112 my $idx = $self->{layout}->xy_to_index ($x, $y);
1113
1114 # byte-index to char-index
1115 my $text = $self->{text};
1116 utf8::encode $text;
1117 $self->{cursor} = length substr $text, 0, $idx;
1118
1119 $self->_set_text ($self->{text});
1120 $self->update;
1121}
1122
1123sub mouse_motion {
1124 my ($self, $ev, $x, $y) = @_;
1125# printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
1126}
1127
1128sub _draw {
1129 my ($self) = @_;
1130
1131 local $self->{fg} = $self->{fg};
1132
1133 if ($FOCUS == $self) {
1134 glColor @{$self->{active_bg}};
1135 $self->{fg} = $self->{active_fg};
664 } else { 1136 } else {
665 my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height}; 1137 glColor @{$self->{bg}};
1138 }
666 1139
667 ($w, $h) 1140 glEnable GL_BLEND;
1141 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1142 glBegin GL_QUADS;
1143 glVertex 0 , 0;
1144 glVertex 0 , $self->{h};
1145 glVertex $self->{w}, $self->{h};
1146 glVertex $self->{w}, 0;
1147 glEnd;
1148 glDisable GL_BLEND;
1149
1150 $self->SUPER::_draw;
1151
1152 #TODO: force update every cursor change :(
1153 if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
1154 glColor @{$self->{fg}};
1155 glBegin GL_LINES;
1156 glVertex $self->{cur_x}, $self->{cur_y};
1157 glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
1158 glEnd;
1159 }
1160}
1161
1162#############################################################################
1163
1164package CFClient::UI::Button;
1165
1166our @ISA = CFClient::UI::Label::;
1167
1168use SDL;
1169use SDL::OpenGL;
1170
1171my @tex =
1172 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
1173 qw(b1_button_active.png);
1174
1175sub new {
1176 my $class = shift;
1177
1178 $class->SUPER::new (
1179 padding => 4,
1180 fg => [1, 1, 1],
1181 bg => [1, 1, 1, 0.2],
1182 active_fg => [1, 1, 0],
1183# active_bg => [0, 0, 0, 0.5],
1184# border_fg => [1, 1, 0],
1185 @_
668 } 1186 )
1187}
669 1188
1189sub button_up {
1190 my ($self, $ev, $x, $y) = @_;
1191
1192 if ($x >= 0 && $x < $self->{w}
1193 && $y >= 0 && $y < $self->{h}) {
1194 $self->emit ("activate");
1195 }
670} 1196}
671 1197
672sub _draw { 1198sub _draw {
673 my ($self) = @_; 1199 my ($self) = @_;
674 1200
675 my $tex = $self->{texture}; 1201 local $self->{fg} = $self->{fg};
1202 my $tex = $tex[0];
676 1203
677 glEnable GL_BLEND; 1204 glEnable GL_BLEND;
678 glEnable GL_TEXTURE_2D; 1205 glEnable GL_TEXTURE_2D;
679 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 1206 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
1207
1208 if ($GRAB == $self) {
1209 $self->{fg} = $self->{active_fg};
1210 }
1211
1212 glBindTexture GL_TEXTURE_2D, $tex->{name};
680 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1213 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
681 1214
682 glColor 1, 0, 0, 1; # TODO color 1215 $tex->draw_quad (0, 0, $self->{w}, $self->{h});
683 1216
684 $tex->draw_quad (0, 0); 1217 glDisable GL_TEXTURE_2D;
685
686 glDisable GL_BLEND; 1218 glDisable GL_BLEND;
687 glDisable GL_TEXTURE_2D;
688}
689 1219
690############################################################################# 1220 $self->SUPER::_draw;
1221}
691 1222
692package Crossfire::Client::Widget::Entry; 1223#############################################################################
693 1224
694our @ISA = Crossfire::Client::Widget::Label::; 1225package CFClient::UI::CheckBox;
1226
1227our @ISA = CFClient::UI::DrawBG::;
695 1228
696use SDL; 1229use SDL;
697use SDL::OpenGL; 1230use SDL::OpenGL;
698 1231
699sub key_down { 1232sub new {
1233 my $class = shift;
1234
1235 $class->SUPER::new (
1236 padding => 2,
1237 fg => [1, 1, 1],
1238 active_fg => [1, 1, 0],
1239 state => 0,
1240 @_
1241 )
1242}
1243
1244sub size_request {
700 my ($self, $ev) = @_; 1245 my ($self) = @_;
701 1246
702 my $mod = $ev->key_mod; 1247 ($self->{padding} * 2 + 6) x 2
703 my $sym = $ev->key_sym; 1248}
704 1249
705 my $uni = $ev->key_unicode; 1250sub size_allocate {
1251 my ($self, $x, $y, $w, $h) = @_;
706 1252
707 my $text = $self->get_text; 1253 $self->_size_allocate ($x, $y, $w, $h);
708
709 if ($sym == SDLK_BACKSPACE) {
710 substr $text, -1, 1, '';
711 } elsif ($uni) {
712 $text .= chr $uni;
713 print "$uni <$text>\n";#d#
714 }
715
716 $self->set_text ($text);
717} 1254}
718 1255
719sub button_down { 1256sub button_down {
720 my ($self, $ev) = @_; 1257 my ($self, $ev, $x, $y) = @_;
721 1258
722 $self->focus_in; 1259 if ($x >= $self->{padding} && $x < $self->{w} - $self->{padding}
1260 && $y >= $self->{padding} && $y < $self->{h} - $self->{padding}) {
1261 $self->{state} = !$self->{state};
1262 $self->emit (changed => $self->{state});
1263 }
723} 1264}
724 1265
725sub _draw { 1266sub _draw {
726 my ($self) = @_; 1267 my ($self) = @_;
727 1268
728 if ($FOCUS == $self) { 1269 $self->SUPER::_draw;
729 glColor 1, 1, 1; 1270
730 } else { 1271 glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
731 glColor 0.7, 0.7, 0.7; 1272
1273 my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
732 } 1274
1275 glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
1276
1277 glBegin GL_LINE_LOOP;
1278 glVertex 0 , 0;
1279 glVertex 0 , $s;
1280 glVertex $s, $s;
1281 glVertex $s, 0;
1282 glEnd;
1283
1284 if ($self->{state}) {
1285 glBegin GL_LINES;
1286 glVertex 0 , 0;
1287 glVertex $s, $s;
1288 glVertex $s, 0;
1289 glVertex 0 , $s;
1290 glEnd;
1291 }
1292}
1293
1294#############################################################################
1295
1296package CFClient::UI::Slider;
1297
1298use strict;
1299
1300use SDL::OpenGL;
1301
1302our @ISA = CFClient::UI::DrawBG::;
1303
1304sub new {
1305 my $class = shift;
1306
1307 # range [value, low, high, page]
1308
1309 my $self = $class->SUPER::new (
1310 fg => [1, 1, 1],
1311 active_fg => [0, 0, 0],
1312 range => [0, 0, 100, 10],
1313 req_w => 40,
1314 req_h => 10,
1315 vertical => 0,
1316 @_
1317 );
1318
1319 $self
1320}
1321
1322sub size_request {
1323 my ($self) = @_;
1324
1325 my $w = $self->{req_w};
1326 my $h = $self->{req_h};
1327
1328 $self->{vertical} ? ($h, $w) : ($w, $h)
1329}
1330
1331sub button_down {
1332 my ($self, $ev, $x, $y) = @_;
1333
1334 $self->SUPER::button_down ($ev, $x, $y);
1335 $self->mouse_motion ($ev, $x, $y);
1336}
1337
1338sub mouse_motion {
1339 my ($self, $ev, $x, $y) = @_;
1340
1341 if ($GRAB == $self) {
1342 my ($value, $lo, $hi, $page) = @{$self->{range}};
1343
1344 my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
1345
1346 $x = $x * ($hi - $lo) / $w + $lo;
1347 $x = $lo if $x < $lo;
1348 $x = $hi - $page if $x > $hi - $page;
1349 $self->{range}[0] = $x;
1350
1351 $self->emit (changed => $x);
1352 $self->update;
1353 }
1354}
1355
1356sub _draw {
1357 my ($self) = @_;
1358
1359 $self->SUPER::_draw ();
1360
1361 my ($w, $h) = @$self{qw(w h)};
1362
1363 if ($self->{vertical}) {
1364 # draw a vertical slider like a rotated horizontal slider
1365
1366 glRotate 90, 0, 0, 1;
1367 glTranslate 0, -$self->{w}, 0;
1368
1369 ($w, $h) = ($h, $w);
1370 }
1371
1372 my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
1373 my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
1374
1375 my ($value, $lo, $hi, $page) = @{$self->{range}};
1376
1377 $page = int $page * $w / ($hi - $lo);
1378 $value = int +($value - $lo) * $w / ($hi - $lo);
1379
1380 $w -= $page;
1381 $page &= ~1;
1382 glTranslate $page * 0.5, 0, 0;
1383 $page ||= 2;
1384
1385 glColor @$fg;
1386 glBegin GL_LINES;
1387 glVertex 0, 0; glVertex 0, $h;
1388 glVertex $w - 1, 0; glVertex $w - 1, $h;
1389 glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
1390 glEnd;
1391
1392 my $knob_a = $value - $page * 0.5;
1393 my $knob_b = $value + $page * 0.5;
733 1394
734 glBegin GL_QUADS; 1395 glBegin GL_QUADS;
735 glVertex 0 , 0; 1396 glColor @$fg;
736 glVertex 0 , $self->{h} - 1; 1397 glVertex $knob_a, 0;
737 glVertex $self->{w} - 1, $self->{h} - 1; 1398 glVertex $knob_a, $h;
738 glVertex $self->{w} - 1, 0; 1399 glVertex $knob_b, $h;
1400 glVertex $knob_b, 0;
1401
1402 if ($knob_a < $knob_b - 2) {
1403 glColor @$bg;
1404 glVertex $knob_a + 1, 1;
1405 glVertex $knob_a + 1, $h - 1;
1406 glVertex $knob_b - 1, $h - 1;
1407 glVertex $knob_b - 1, 1;
1408 }
739 glEnd; 1409 glEnd;
740
741 $self->SUPER::_draw;
742} 1410}
743 1411
744############################################################################# 1412#############################################################################
745 1413
746package Crossfire::Client::Widget::MapWidget; 1414package CFClient::UI::MapWidget;
747 1415
748use strict; 1416use strict;
749 1417
750use List::Util qw(min max); 1418use List::Util qw(min max);
751 1419
752use SDL; 1420use SDL;
753use SDL::OpenGL; 1421use SDL::OpenGL;
754use SDL::OpenGL::Constants;
755 1422
756our @ISA = Crossfire::Client::Widget::; 1423our @ISA = CFClient::UI::Base::;
1424
1425sub new {
1426 my $class = shift;
1427
1428 $class->SUPER::new (
1429 z => -1,
1430 list => (glGenLists 1),
1431 @_
1432 )
1433}
757 1434
758sub key_down { 1435sub key_down {
759 print "MAPKEYDOWN\n"; 1436 print "MAPKEYDOWN\n";
760} 1437}
761 1438
762sub key_up { 1439sub key_up {
763} 1440}
764 1441
765sub size_request { 1442sub size_request {
766 ( 1443 (
767 1 + int $::WIDTH / 32, 1444 1 + 32 * int $::WIDTH / 32,
768 1 + int $::HEIGHT / 32, 1445 1 + 32 * int $::HEIGHT / 32,
769 ) 1446 )
770} 1447}
771 1448
1449sub update {
1450 my ($self) = @_;
1451
1452 $self->{need_update} = 1;
1453 $self->SUPER::update;
1454}
1455
772sub _draw { 1456sub draw {
773 my ($self) = @_; 1457 my ($self) = @_;
774 1458
1459 if (delete $self->{need_update}) {
1460 glNewList $self->{list}, GL_COMPILE;
1461
775 my $mx = $::CONN->{mapx}; 1462 my $mx = $::CONN->{mapx};
776 my $my = $::CONN->{mapy}; 1463 my $my = $::CONN->{mapy};
777 1464
778 my $map = $::CONN->{map}; 1465 my $map = $::CONN->{map};
779 1466
780 my ($xofs, $yofs); 1467 my ($xofs, $yofs);
781 1468
782 my $sw = 1 + int $::WIDTH / 32; 1469 my $sw = 1 + int $::WIDTH / 32;
783 my $sh = 1 + int $::HEIGHT / 32; 1470 my $sh = 1 + int $::HEIGHT / 32;
784 1471
785 if ($::CONN->{mapw} > $sw) { 1472 if ($::CONN->{mapw} > $sw) {
786 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 1473 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
787 } else { 1474 } else {
788 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 1475 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
789 } 1476 }
790 1477
791 if ($::CONN->{maph} > $sh) { 1478 if ($::CONN->{maph} > $sh) {
792 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 1479 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
793 } else { 1480 } else {
794 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 1481 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
795 } 1482 }
796 1483
797 glEnable GL_TEXTURE_2D; 1484 glEnable GL_TEXTURE_2D;
798 glEnable GL_BLEND; 1485 glEnable GL_BLEND;
1486 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
799 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 1487 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
1488 glColor 1, 1, 1, 1;
800 1489
801 my $sw4 = ($sw + 3) & ~3; 1490 my $sw4 = ($sw + 3) & ~3;
802 my $lighting = "\x00" x ($sw4 * $sh); 1491 my $darkness = "\x00" x ($sw4 * $sh);
803 1492
804 for my $x (0 .. $sw - 1) { 1493 for my $x (0 .. $sw - 1) {
1494 my $row = $map->[$x + $xofs];
805 for my $y (0 .. $sh - 1) { 1495 for my $y (0 .. $sh - 1) {
806 1496
807 my $cell = $map->[$x + $xofs][$y + $yofs] 1497 my $cell = $row->[$y + $yofs]
808 or next; 1498 or next;
809 1499
810 my $darkness = $cell->[0] * (1 / 255); 1500 my $dark = $cell->[0];
811 if ($darkness < 0) { 1501 if ($dark < 0) {
812 $darkness = $cell->[1] ? 0.1 : 0; 1502 substr $darkness, $y * $sw4 + $x, 1, chr 224;
1503 } else {
1504 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
813 } 1505 }
814 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
815 1506
816 for my $num (grep $_, @$cell[1,2,3]) { 1507 for my $num (grep $_, @$cell[1,2,3]) {
817 my $tex = $::CONN->{face}[$num]{texture} || next; 1508 my $tex = $::CONN->{face}[$num]{texture} || next;
1509
1510 my ($w, $h) = @$tex{qw(w h)};
1511
1512 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
818 1513 }
819 my $w = $tex->{width};
820 my $h = $tex->{height};
821
822 my $px = ($x + 1) * 32 - $w;
823 my $py = ($y + 1) * 32 - $h;
824
825 $tex->draw_quad ($px, $py, $w, $h);
826 } 1514 }
827 } 1515 }
828 }
829 1516
830# if (1) { # higher quality darkness 1517# if (1) { # higher quality darkness
831# $lighting =~ s/(.)/$1$1$1/gs; 1518# $lighting =~ s/(.)/$1$1$1/gs;
832# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 1519# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
833# 1520#
… …
835# 1522#
836# $lighting = $pb->get_pixels; 1523# $lighting = $pb->get_pixels;
837# $lighting =~ s/(.)../$1/gs; 1524# $lighting =~ s/(.)../$1/gs;
838# } 1525# }
839 1526
840 $lighting = new Crossfire::Client::Texture
841 width => $sw4,
842 height => $sh,
843 data => $lighting,
844 internalformat => GL_ALPHA,
845 format => GL_ALPHA;
846
847 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
848 glColor 0.45, 0.45, 0.45, 1;
849 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1527 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
850 glBindTexture GL_TEXTURE_2D, $lighting->{name};
851 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
852 1528
1529 if ($::CFG->{fow_smooth}) { # smooth fog of war
1530 my @conv = (
1531 0.05, 0.05, 0.05,
1532 0.05, 0.60, 0.05,
1533 0.05, 0.05, 0.05,
1534 );
1535 CFClient::glConvolutionParameteri GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_REPLICATE_BORDER;
1536 CFClient::glConvolutionFilter2D GL_CONVOLUTION_2D,
1537 GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT,
1538 pack "f*", @conv;
1539 glEnable GL_CONVOLUTION_2D;
1540 }
1541
1542 $darkness = new CFClient::Texture
1543 w => $sw4,
1544 h => $sh,
1545 data => $darkness,
1546 internalformat => GL_ALPHA,
1547 format => GL_ALPHA;
1548
1549 glColor +($::CFG->{fow_intensity}) x 3, 1;
853 $lighting->draw_quad (0, 0, $sw4 * 32, $sh * 32); 1550 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
854 1551
1552 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
1553
855 glDisable GL_TEXTURE_2D; 1554 glDisable GL_TEXTURE_2D;
856 glDisable GL_BLEND; 1555 glDisable GL_BLEND;
1556
1557 glEndList;
1558 }
1559
1560 glCallList $self->{list};
1561
1562 if ($FOCUS != $self) {
1563 glEnable GL_BLEND;
1564 glColor 0, 0, 1, 0.4;
1565 glBegin GL_QUADS;
1566 glVertex 0, 0;
1567 glVertex 0, $::HEIGHT;
1568 glVertex $::WIDTH, $::HEIGHT;
1569 glVertex $::WIDTH, 0;
1570 glEnd;
1571 glDisable GL_BLEND;
1572 }
857} 1573}
858 1574
859my %DIR = ( 1575my %DIR = (
860 SDLK_KP8, [1, "north"], 1576 SDLK_KP8, [1, "north"],
861 SDLK_KP9, [2, "northeast"], 1577 SDLK_KP9, [2, "northeast"],
… …
877 1593
878 my $mod = $ev->key_mod; 1594 my $mod = $ev->key_mod;
879 my $sym = $ev->key_sym; 1595 my $sym = $ev->key_sym;
880 1596
881 if ($sym == SDLK_KP5) { 1597 if ($sym == SDLK_KP5) {
882 $::CONN->send ("command stay fire"); 1598 $::CONN->user_send ("command stay fire");
1599 } elsif ($sym == SDLK_a) {
1600 $::CONN->user_send ("command apply");
883 } elsif (exists $DIR{$sym}) { 1601 } elsif (exists $DIR{$sym}) {
884 if ($mod & KMOD_SHIFT) { 1602 if ($mod & KMOD_SHIFT) {
885 $self->{shft}++; 1603 $self->{shft}++;
886 $::CONN->send ("command fire $DIR{$sym}[0]"); 1604 $::CONN->user_send ("command fire $DIR{$sym}[0]");
887 } elsif ($mod & KMOD_CTRL) { 1605 } elsif ($mod & KMOD_CTRL) {
888 $self->{ctrl}++; 1606 $self->{ctrl}++;
889 $::CONN->send ("command run $DIR{$sym}[0]"); 1607 $::CONN->user_send ("command run $DIR{$sym}[0]");
890 } else { 1608 } else {
891 $::CONN->send ("command $DIR{$sym}[1]"); 1609 $::CONN->user_send ("command $DIR{$sym}[1]");
892 } 1610 }
893 } 1611 }
894} 1612}
895 1613
896sub key_up { 1614sub key_up {
… …
898 1616
899 my $mod = $ev->key_mod; 1617 my $mod = $ev->key_mod;
900 my $sym = $ev->key_sym; 1618 my $sym = $ev->key_sym;
901 1619
902 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) { 1620 if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
903 $::CONN->send ("command fire_stop"); 1621 $::CONN->user_send ("command fire_stop");
904 } 1622 }
905 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1623 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
906 $::CONN->send ("command run_stop"); 1624 $::CONN->user_send ("command run_stop");
907 } 1625 }
908} 1626}
909 1627
910############################################################################# 1628#############################################################################
911 1629
912package Crossfire::Client::Widget::Animator; 1630package CFClient::UI::Animator;
913 1631
914use SDL::OpenGL; 1632use SDL::OpenGL;
915 1633
916our @ISA = Crossfire::Client::Widget::Bin::; 1634our @ISA = CFClient::UI::Bin::;
917 1635
918sub moveto { 1636sub moveto {
919 my ($self, $x, $y) = @_; 1637 my ($self, $x, $y) = @_;
920 1638
921 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1639 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
… …
926} 1644}
927 1645
928sub animate { 1646sub animate {
929 my ($self, $interval) = @_; 1647 my ($self, $interval) = @_;
930 1648
931 printf "%5.2f\n", 1 / $interval;#d#
932
933 $self->{time} -= $interval * $self->{speed}; 1649 $self->{time} -= $interval * $self->{speed};
934 if ($self->{time} <= 0) { 1650 if ($self->{time} <= 0) {
935 $self->{time} = 0; 1651 $self->{time} = 0;
936 ::animation_stop $self; 1652 ::animation_stop $self;
937 } 1653 }
… …
951 glPopMatrix; 1667 glPopMatrix;
952} 1668}
953 1669
954############################################################################# 1670#############################################################################
955 1671
956package Crossfire::Client::Widget::Toplevel; 1672package CFClient::UI::Toplevel;
957 1673
958our @ISA = Crossfire::Client::Widget::Container::; 1674our @ISA = CFClient::UI::Container::;
959 1675
960sub size_request { 1676sub size_request {
961 ($::WIDTH, $::HEIGHT) 1677 ($::WIDTH, $::HEIGHT)
962} 1678}
963 1679
964sub size_allocate { 1680sub size_allocate {
965 my ($self, $w, $h) = @_; 1681 my ($self, $x, $y, $w, $h) = @_;
966 1682
967 $self->SUPER::size_allocate ($w, $h); 1683 $self->_size_allocate ($x, $y, $w, $h);
968 1684
969 $_->size_allocate ($_->size_request) 1685 $_->size_allocate ($_->{x}, $_->{y}, $_->size_request)
970 for @{$self->{children}}; 1686 for @{$self->{children}};
971} 1687}
972 1688
1689sub translate {
1690 my ($self, $x, $y) = @_;
1691
1692 ($x, $y)
1693}
1694
973sub update { 1695sub update {
974 my ($self) = @_; 1696 my ($self) = @_;
975 1697
976 $self->size_allocate ($self->size_request); 1698 $self->size_allocate (0, 0, $::WIDTH, $::HEIGHT);
977 ::refresh (); 1699 ::refresh ();
978} 1700}
979 1701
980sub add { 1702sub add {
981 my ($self, $widget) = @_; 1703 my ($self, $widget) = @_;
982 1704
983 $self->SUPER::add ($widget); 1705 $self->SUPER::add ($widget);
984 1706
985 $widget->size_allocate ($widget->size_request); 1707 $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
986} 1708}
987 1709
988sub draw { 1710sub draw {
989 my ($self) = @_; 1711 my ($self) = @_;
990 1712
991 $self->_draw; 1713 $self->_draw;
992} 1714}
993 1715
994############################################################################# 1716#############################################################################
995 1717
996package Crossfire::Client::Widget; 1718package CFClient::UI;
997 1719
998$TOPLEVEL = new Crossfire::Client::Widget::Toplevel; 1720$TOPLEVEL = new CFClient::UI::Toplevel;
999 1721
10001 17221
1001 1723

Diff Legend

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