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.35 by root, Sun Apr 9 17:34:15 2006 UTC vs.
Revision 1.67 by root, Tue Apr 11 14:36:59 2006 UTC

1package Crossfire::Client::Widget; 1package CFClient::Widget;
2 2
3use strict; 3use strict;
4 4
5use Scalar::Util; 5use Scalar::Util;
6 6
7use SDL::OpenGL; 7use SDL::OpenGL;
8use SDL::OpenGL::Constants; 8use SDL::OpenGL::Constants;
9 9
10our $FOCUS; # the widget with current focus 10use CFClient;
11#our @ACTIVE_WIDGETS; 11
12our ($FOCUS, $HOVER, $GRAB); # various widgets
13
14our $TOPLEVEL;
15our $BUTTON_STATE;
12 16
13# class methods for events 17# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 18sub feed_sdl_key_down_event {
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 19 $FOCUS->key_down ($_[0]) if $FOCUS;
20}
21
22sub feed_sdl_key_up_event {
23 $FOCUS->key_up ($_[0]) if $FOCUS;
24}
25
16sub feed_sdl_button_down_event { } 26sub feed_sdl_button_down_event {
27 my ($ev) = @_;
28 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
29
30 if (!$BUTTON_STATE) {
31 my $widget = $TOPLEVEL->find_widget ($x, $y);
32
33 $GRAB = $widget;
34 $GRAB->update if $GRAB;
35 }
36
37 $BUTTON_STATE |= 1 << ($ev->button - 1);
38
39 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
40}
41
17sub feed_sdl_button_up_event { } 42sub feed_sdl_button_up_event {
43 my ($ev) = @_;
44 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
45
46 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
47
48 $BUTTON_STATE &= ~(1 << ($ev->button - 1));
49
50 $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
51
52 if (!$BUTTON_STATE) {
53 my $grab = $GRAB; undef $GRAB;
54 $grab->update if $grab;
55 $GRAB->update if $GRAB;
56 }
57}
58
59sub feed_sdl_motion_event {
60 my ($ev) = @_;
61 my ($x, $y) = ($ev->motion_x, $ev->motion_y);
62
63 my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
64
65 if ($widget != $HOVER) {
66 my $hover = $HOVER; $HOVER = $widget;
67
68 $hover->update if $hover;
69 $HOVER->update if $HOVER;
70 }
71
72 $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
73}
18 74
19sub new { 75sub new {
20 my $class = shift; 76 my $class = shift;
21 77
22 bless { @_ }, $class 78 bless {
79 x => 0,
80 y => 0,
81 z => 0,
82 @_
83 }, $class
23} 84}
24
25#sub activate {
26# push @ACTIVE_WIDGETS, $_[0];
27# Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28#}
29
30#sub deactivate {
31# @ACTIVE_WIDGETS =
32# sort { $a->{z} <=> $b->{z} }
33# grep { $_ && $_ != $_[0] }
34# @ACTIVE_WIDGETS;
35#}
36 85
37sub move { 86sub move {
38 my ($self, $x, $y, $z) = @_; 87 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 88 $self->{x} = $x;
40 $self->{y} = $y; 89 $self->{y} = $y;
… …
44sub needs_redraw { 93sub needs_redraw {
45 0 94 0
46} 95}
47 96
48sub size_request { 97sub size_request {
98 require Carp;
49 die "size_request is abtract"; 99 Carp::confess "size_request is abtract";
100}
101
102sub size_allocate {
103 my ($self, $w, $h) = @_;
104
105 $self->{w} = $w;
106 $self->{h} = $h;
107}
108
109# translate global koordinates to local coordinate system
110sub translate {
111 my ($self, $x, $y) = @_;
112
113 $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
50} 114}
51 115
52sub focus_in { 116sub focus_in {
53 my ($widget) = @_; 117 my ($self) = @_;
54 $FOCUS = $widget; 118
119 my $focus = $FOCUS; $FOCUS = $self;
120 $focus->update if $focus;
121 $FOCUS->update;
55} 122}
56 123
57sub focus_out { 124sub focus_out {
58 my ($widget) = @_; 125 my ($self) = @_;
59}
60 126
61sub key_down { 127 return unless $FOCUS == $self;
62 my ($widget, $sdlev) = @_;
63}
64 128
65sub key_up { 129 my $focus = $FOCUS; undef $FOCUS;
66 my ($widget, $sdlev) = @_; 130 $focus->update if $focus; #?
67} 131}
68 132
133sub mouse_motion { }
134sub button_up { }
69sub button_down { 135sub button_down { }
70 my ($widget, $sdlev) = @_; 136sub key_down { }
71} 137sub key_up { }
72 138
73sub button_up { 139sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
74 my ($widget, $sdlev) = @_; 140sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
75}
76
77sub w { $_[0]->{w} }
78sub h { $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 141sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 142sub y { $_[0]{y} = $_[1] if @_ > 1; $_[0]{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 143sub z { $_[0]{z} = $_[1] if @_ > 1; $_[0]{z} }
82 144
83sub draw { 145sub draw {
84 my ($self) = @_; 146 my ($self) = @_;
85 147
86 glPushMatrix; 148 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 149 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 150 $self->_draw;
151 if ($self == $HOVER) {
152 glColor 1, 1, 1, 0.4;
153 glEnable GL_BLEND;
154 glBegin GL_QUADS;
155 glVertex 0 , 0;
156 glVertex $self->{w}, 0;
157 glVertex $self->{w}, $self->{h};
158 glVertex 0 , $self->{h};
159 glEnd;
160 glDisable GL_BLEND;
161 }
89 glPopMatrix; 162 glPopMatrix;
90} 163}
91 164
92sub _draw { 165sub _draw {
93 my ($widget) = @_; 166 my ($self) = @_;
167
168 warn "no draw defined for $self\n";
94} 169}
95 170
96sub bbox { 171sub bbox {
97 my ($self) = @_; 172 my ($self) = @_;
98 my ($w, $h) = $self->size_request; 173 my ($w, $h) = $self->size_request;
… …
102 $self->{x} = $w, 177 $self->{x} = $w,
103 $self->{y} = $h 178 $self->{y} = $h
104 ) 179 )
105} 180}
106 181
182sub find_widget {
183 my ($self, $x, $y) = @_;
184
185 return $self
186 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
187 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
188
189 ()
190}
191
107sub del_parent { $_[0]->{parent} = undef } 192sub del_parent { $_[0]->{parent} = undef }
108 193
109sub set_parent { 194sub set_parent {
110 my ($self, $par) = @_; 195 my ($self, $par) = @_;
111 196
… …
128 my ($self) = @_; 213 my ($self) = @_;
129 214
130 #$self->deactivate; 215 #$self->deactivate;
131} 216}
132 217
133package Crossfire::Client::Widget::Bin; 218#############################################################################
134 219
220package CFClient::Widget::Empty;
221
135our @ISA = Crossfire::Client::Widget::; 222our @ISA = CFClient::Widget::;
136 223
137sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update } 224sub size_request {
225 (0, 0)
226}
138 227
139sub get { $_[0]->{child} } 228sub draw { }
229
230#############################################################################
231
232package CFClient::Widget::Container;
233
234our @ISA = CFClient::Widget::;
235
236sub new {
237 my ($class, %arg) = @_;
238
239 my $children = delete $arg{children} || [];
240
241 my $self = $class->SUPER::new (children => [], %arg);
242 $self->add ($_) for @$children;
243
244 $self
245}
246
247sub add {
248 my ($self, $chld, $expand) = @_;
249
250 $chld->{expand} = $expand;
251 $chld->set_parent ($self);
252
253 $self->{children} = [
254 sort { $a->{z} <=> $b->{z} }
255 @{$self->{children}}, $chld
256 ];
257
258 $self->size_allocate ($self->{w}, $self->{h})
259 if $self->{w}; #TODO: check for "realised state"
260}
140 261
141sub remove { 262sub remove {
142 my ($self, $chld) = @_; 263 my ($self, $widget) = @_;
143 delete $self->{child} 264
144 if $self->{child} == $chld; 265 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
266
267 $self->size_allocate ($self->{w}, $self->{h});
145} 268}
269
270sub find_widget {
271 my ($self, $x, $y) = @_;
272
273 $x -= $self->{x};
274 $y -= $self->{y};
275
276 my $res;
277
278 for (reverse @{ $self->{children} }) {
279 $res = $_->find_widget ($x, $y)
280 and return $res;
281 }
282
283 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
284}
285
286sub _draw {
287 my ($self) = @_;
288
289 $_->draw for @{$self->{children}};
290}
291
292#############################################################################
293
294package CFClient::Widget::Bin;
295
296our @ISA = CFClient::Widget::Container::;
297
298sub new {
299 my ($class, %arg) = @_;
300
301 my $child = (delete $arg{child}) || new CFClient::Widget::Empty::;
302
303 $class->SUPER::new (children => [$child], %arg)
304}
305
306sub add {
307 my ($self, $widget) = @_;
308
309 $self->{children} = [];
310
311 $self->SUPER::add ($widget);
312}
313
314sub remove {
315 my ($self, $widget) = @_;
316
317 $self->SUPER::remove ($widget);
318
319 $self->{children} = [new CFClient::Widget::Empty]
320 unless @{$self->{children}};
321}
322
323sub child { $_[0]->{children}[0] }
146 324
147sub size_request { 325sub size_request {
148 $_[0]->{child}->size_request if $_[0]->{child} 326 $_[0]{children}[0]->size_request if $_[0]{children}[0];
327}
328
329sub size_allocate {
330 my ($self, $w, $h) = @_;
331
332 $self->SUPER::size_allocate ($w, $h);
333 $self->{children}[0]->size_allocate ($w, $h)
334 if $self->{children}[0]
335}
336
337#############################################################################
338
339package CFClient::Widget::Window;
340
341our @ISA = CFClient::Widget::Bin::;
342
343use SDL::OpenGL;
344
345sub new {
346 my ($class, %arg) = @_;
347
348 my $self = $class->SUPER::new (%arg);
349}
350
351sub update {
352 my ($self) = @_;
353
354 # we want to do this delayed...
355 $self->render_chld;
356 $self->SUPER::update;
357}
358
359sub render_chld {
360 my ($self) = @_;
361
362 $self->{texture} =
363 CFClient::Texture->new_from_opengl (
364 $self->{w}, $self->{h}, sub { $self->child->draw }
365 );
366}
367
368sub size_allocate {
369 my ($self, $w, $h) = @_;
370
371 $self->{w} = $w;
372 $self->{h} = $h;
373
374 $self->child->size_allocate ($w, $h);
375
376 $self->render_chld;
149} 377}
150 378
151sub _draw { 379sub _draw {
152 my ($self) = @_; 380 my ($self) = @_;
153 381
154 $self->{child}->draw; 382 my ($w, $h) = ($self->w, $self->h);
155}
156
157package Crossfire::Client::Widget::Toplevel;
158
159our @ISA = Crossfire::Client::Widget::;
160
161use SDL::OpenGL;
162
163sub add {
164 my ($self, $chld) = @_;
165
166 push @{$self->{childs}}, $chld;
167 @{$self->{childs}} =
168 sort { $a->{z} <=> $b->{z} }
169 @{$self->{childs}};
170
171 $chld->set_parent ($self);
172}
173
174sub remove {
175 my ($self, $chld) = @_;
176 @{$self->{childs}} =
177 sort { $a->{z} <=> $b->{z} }
178 grep { $_ && $_ != $_[0] }
179 @{$self->{childs}}
180}
181
182sub update {
183 my ($self) = @_;
184 ::refresh ();
185}
186
187sub _draw {
188 my ($self) = @_;
189
190 $_->draw for @{$self->{childs}};
191}
192
193package Crossfire::Client::Widget::Window;
194
195our @ISA = Crossfire::Client::Widget::Bin::;
196
197use SDL::OpenGL;
198
199sub add {
200 my ($self, $chld) = @_;
201 $self->SUPER::add ($chld);
202 $chld->set_parent ($self);
203 $self->update; #TODO: Move this to the size_request event propably?
204}
205
206sub remove {
207 my ($self) = @_;
208 # TODO FIXME: removing a child from a window will crash, see render_chld
209 $self->update;
210}
211
212sub update {
213 my ($self) = @_;
214 $self->render_chld;
215}
216
217sub render_chld {
218 my ($self) = @_;
219 my $chld = $self->get;
220 my ($w, $h) = $self->size_request;
221
222 $self->{texture} =
223 Crossfire::Client::Texture->new_from_opengl (
224 $w, $h, sub { $chld->draw }
225 );
226 $self->{texture}->upload;
227}
228
229sub size_request {
230 my ($self) = @_;
231 my $chld = $self->get
232 or return (0, 0);
233 $chld->size_request
234}
235
236sub _draw {
237 my ($self) = @_;
238
239 my ($w, $h) = $self->size_request;#TODO# use width/height of texture
240 383
241 my $tex = $self->{texture} 384 my $tex = $self->{texture}
242 or return; 385 or return;
243 386
244 glEnable GL_BLEND; 387 glEnable GL_BLEND;
245 glEnable GL_TEXTURE_2D; 388 glEnable GL_TEXTURE_2D;
246 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 389 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
247 glBindTexture GL_TEXTURE_2D, $tex->{name};
248 390
249 glBegin GL_QUADS; 391 $tex->draw_quad (0, 0, $w, $h);
250 glTexCoord 0, 0; glVertex 0, 0;
251 glTexCoord 0, 1; glVertex 0, $h;
252 glTexCoord 1, 1; glVertex $w, $h;
253 glTexCoord 1, 0; glVertex $w, 0;
254 glEnd;
255 392
256 glDisable GL_BLEND; 393 glDisable GL_BLEND;
257 glDisable GL_TEXTURE_2D; 394 glDisable GL_TEXTURE_2D;
258} 395}
259 396
397#############################################################################
398
260package Crossfire::Client::Widget::Frame; 399package CFClient::Widget::Frame;
261 400
262our @ISA = Crossfire::Client::Widget::Bin::; 401our @ISA = CFClient::Widget::Bin::;
263 402
264use SDL::OpenGL; 403use SDL::OpenGL;
265 404
266sub size_request { 405sub size_request {
267 my ($self) = @_; 406 my ($self) = @_;
268 my $chld = $self->get 407 my $chld = $self->child
269 or return (0, 0); 408 or return (0, 0);
270 409
271 $chld->move (2, 2); 410 $chld->move (2, 2);
272 411
273 map { $_ + 4 } $chld->size_request; 412 map { $_ + 4 } $chld->size_request;
274} 413}
275 414
415sub size_allocate {
416 my ($self, $w, $h) = @_;
417
418 $self->{w} = $w;
419 $self->{h} = $h;
420
421 $self->child->size_allocate ($w - 4, $h - 4);
422 $self->child->move (2, 2);
423}
424
276sub _draw { 425sub _draw {
277 my ($self) = @_; 426 my ($self) = @_;
278 427
279 my $chld = $self->get; 428 my $chld = $self->child;
280 429
281 my ($w, $h) = $chld->size_request; 430 my ($w, $h) = $chld->size_request;
282 431
283 glBegin GL_QUADS; 432 glBegin GL_QUADS;
284 glColor 0, 0, 0; 433 glColor 0, 0, 0;
285 glTexCoord 0, 0; glVertex 0 , 0; 434 glVertex 0 , 0;
286 glTexCoord 0, 1; glVertex 0 , $h + 4; 435 glVertex 0 , $h + 4;
287 glTexCoord 1, 1; glVertex $w + 4 , $h + 4; 436 glVertex $w + 4 , $h + 4;
288 glTexCoord 1, 0; glVertex $w + 4 , 0; 437 glVertex $w + 4 , 0;
289 glEnd; 438 glEnd;
290 439
291 $chld->draw; 440 $chld->draw;
292} 441}
293 442
443#############################################################################
444
294package Crossfire::Client::Widget::FancyFrame; 445package CFClient::Widget::FancyFrame;
295 446
296our @ISA = Crossfire::Client::Widget::Frame::; 447our @ISA = CFClient::Widget::Bin::;
297 448
298use SDL::OpenGL; 449use SDL::OpenGL;
299 450
451my @tex =
452 map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
453 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
454
455sub size_request {
456 my ($self) = @_;
457
458 my ($w, $h) = $self->SUPER::size_request;
459
460 $h += $tex[1]->{height};
461 $h += $tex[4]->{height};
462 $w += $tex[2]->{width};
463 $w += $tex[3]->{width};
464
465 ($w, $h)
466}
467
468sub size_allocate {
469 my ($self, $w, $h) = @_;
470
471 $self->SUPER::size_allocate ($w, $h);
472
473 $h -= $tex[1]->{height};
474 $h -= $tex[4]->{height};
475 $w -= $tex[2]->{width};
476 $w -= $tex[3]->{width};
477
478 $h = $h < 0 ? 0 : $h;
479 $w = $w < 0 ? 0 : $w;
480
481 my $child = $self->child;
482
483 $child->size_allocate ($w, $h);
484 $child->move ($tex[3]->{width}, $tex[1]->{height});
485}
486
487sub _draw {
488 my ($self) = @_;
489
490 my ($w, $h) = ($self->{w}, $self->{h});
491 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
492
493 glEnable GL_BLEND;
494 glEnable GL_TEXTURE_2D;
495 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
496 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
497
498 my $top = $tex[1];
499 $top->draw_quad (0, 0, $w, $top->{height});
500
501 my $left = $tex[3];
502 $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
503
504 my $right = $tex[2];
505 $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
506
507 my $bottom = $tex[4];
508 $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
509
510 my $bg = $tex[0];
511 glBindTexture GL_TEXTURE_2D, $bg->{name};
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
513 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
514 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
515
516 my $rep_x = $cw / $bg->{width};
517 my $rep_y = $ch / $bg->{height};
518
519 $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
520
521 glDisable GL_BLEND;
522 glDisable GL_TEXTURE_2D;
523
524 $self->child->draw;
525
526}
527
528#############################################################################
529
530package CFClient::Widget::Table;
531
532our @ISA = CFClient::Widget::Bin::;
533
534use SDL::OpenGL;
535
536sub add {
537 my ($self, $x, $y, $chld) = @_;
538 my $old_chld = $self->{children}[$y][$x];
539
540 $self->{children}[$y][$x] = $chld;
541 $chld->set_parent ($self);
542 $self->update;
543}
544
545sub max_row_height {
546 my ($self, $row) = @_;
547
548 my $hs = 0;
549 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
550 my $c = $self->{children}->[$row]->[$xi];
551 if ($c) {
552 my ($w, $h) = $c->size_request;
553 if ($hs < $h) { $hs = $h }
554 }
555 }
556 return $hs;
557}
558
559sub max_col_width {
560 my ($self, $col) = @_;
561
562 my $ws = 0;
563 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
564 my $c = ($self->{children}->[$yi] || [])->[$col];
565 if ($c) {
566 my ($w, $h) = $c->size_request;
567 if ($ws < $w) { $ws = $w }
568 }
569 }
570 return $ws;
571}
572
573sub size_request {
574 my ($self) = @_;
575
576 my ($hs, $ws) = (0, 0);
577
578 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
579 $hs += $self->max_row_height ($yi);
580 }
581
582 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
583 my $wm = 0;
584 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
585 $wm += $self->max_col_width ($xi)
586 }
587 if ($ws < $wm) { $ws = $wm }
588 }
589
590 return ($ws, $hs);
591}
592
593sub _draw {
594 my ($self) = @_;
595
596 my $y = 0;
597 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
598 my $x = 0;
599
600 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
601
602 my $c = $self->{children}->[$yi]->[$xi];
603 if ($c) {
604 $c->move ($x, $y, 0); #TODO: Move to size_request
605 $c->draw if $c;
606 }
607
608 $x += $self->max_col_width ($xi);
609 }
610
611 $y += $self->max_row_height ($yi);
612 }
613}
614
615#############################################################################
616
617package CFClient::Widget::VBox;
618
619our @ISA = CFClient::Widget::Container::;
620
621use SDL::OpenGL;
622
623sub size_request {
624 my ($self) = @_;
625
626 my @alloc = map [$_->size_request], @{$self->{children}};
627
628 (
629 (List::Util::max map $_->[0], @alloc),
630 (List::Util::sum map $_->[1], @alloc),
631 )
632}
633
634sub size_allocate {
635 my ($self, $w, $h) = @_;
636
637 $self->w ($w);
638 $self->h ($h);
639
640 my $exp;
641 my @oth;
642 # find expand widget
643 for (@{$self->{children}}) {
644 if ($_->{expand}) {
645 $exp = $_;
646 last;
647 }
648 push @oth, $_;
649 }
650
651 my ($ow, $oh);
652
653 # get sizes of other widgets
654 for (@oth) {
655 my ($w, $h) = $_->size_request;
656 $oh += $h;
657 if ($ow < $w) { $ow = $w }
658 }
659
660 my $y = 0;
661 for (@{$self->{children}}) {
662 $_->move (0, $y);
663
664 if ($_ == $exp) {
665 $_->size_allocate ($w, $h - $oh);
666 $y += $h - $oh;
667 } else {
668 my ($cw, $h) = $_->size_request;
669 $_->size_allocate ($w, $h);
670 $y += $h;
671 }
672 }
673}
674
675#############################################################################
676
677package CFClient::Widget::Label;
678
679our @ISA = CFClient::Widget::;
680
681use SDL::OpenGL;
682
300sub new { 683sub new {
301 my ($self, $theme) = @_; 684 my ($class, %arg) = @_;
685
686 # TODO: color, and make height, xyz etc. optional
302 $self = $self->SUPER::new; 687 my $self = $class->SUPER::new (
303 688 color => [1, 1, 1],
304 $self->{txts} = [ 689 height => $::FONTSIZE,
305 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ } 690 text => "",
306 qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/ 691 layout => new CFClient::Layout,
692 %arg
307 ]; 693 );
694
695 $self->set_text ($self->{text});
696
308 $self 697 $self
698}
309 699
700sub set_text {
701 my ($self, $text) = @_;
702
703 $self->{text} = $text;
704 $self->{layout}->set_markup ($text);
705
706 delete $self->{texture};
707}
708
709sub get_text {
710 my ($self, $text) = @_;
711
712 $self->{text}
310} 713}
311 714
312sub size_request { 715sub size_request {
313 my ($self) = @_; 716 my ($self) = @_;
314 my ($w, $h) = $self->get->size_request;
315 717
316 $h += $self->{txts}->[1]->{height}; 718 $self->{layout}->set_width;
317 $h += $self->{txts}->[4]->{height}; 719 $self->{layout}->set_height ($self->{height});
318 $w += $self->{txts}->[2]->{width}; 720 $self->{layout}->size
319 $w += $self->{txts}->[3]->{width}; 721# if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
320 722# (
321 $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height}); 723# $self->{texture}{width},
322 724# $self->{texture}{height},
725# )
726# } else {
727# my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
728#
323 ($w, $h) 729# ($w, $h)
730# }
731}
732
733sub size_allocate {
734 my ($self, $w, $h) = @_;
735
736 $self->SUPER::size_allocate ($w, $h);
737 delete $self->{texture};
324} 738}
325 739
326sub _draw { 740sub _draw {
327 my ($self) = @_; 741 my ($self) = @_;
328 742
329 my ($w, $h) = $self->size_request; 743 my $tex = $self->{texture} ||= do {
330 my ($cw, $ch) = $self->get->size_request; 744 $self->{layout}->set_width ($self->{w});
745 new_from_layout CFClient::Texture $self->{layout};
746 };
331 747
332 glEnable GL_BLEND; 748 glEnable GL_BLEND;
333 glEnable GL_TEXTURE_2D; 749 glEnable GL_TEXTURE_2D;
334 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 750 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
335 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 751 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
336 752
753 glColor @{$self->{color}};
337 754
338 my $top = $self->{txts}->[1]; 755 $tex->draw_quad (0, 0);
339 glBindTexture GL_TEXTURE_2D, $top->{name};
340
341 glColor 1, 1, 1, 0.8;
342
343 glBegin GL_QUADS;
344 glTexCoord 0, 0; glVertex 0 , 0;
345 glTexCoord 0, 1; glVertex 0 , $top->{height};
346 glTexCoord 1, 1; glVertex $w , $top->{height};
347 glTexCoord 1, 0; glVertex $w , 0;
348 glEnd;
349
350 my $left = $self->{txts}->[3];
351 glBindTexture GL_TEXTURE_2D, $left->{name};
352
353 glColor 1, 1, 1, 0.8;
354
355 glBegin GL_QUADS;
356 glTexCoord 0, 0; glVertex 0 , $top->{height};
357 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
358 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
359 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
360 glEnd;
361
362 my $right = $self->{txts}->[2];
363 glBindTexture GL_TEXTURE_2D, $right->{name};
364
365 glColor 1, 1, 1, 0.8;
366
367 glBegin GL_QUADS;
368 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
369 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
370 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
371 glTexCoord 1, 0; glVertex $w , $top->{height};
372 glEnd;
373
374 my $bottom = $self->{txts}->[4];
375 glBindTexture GL_TEXTURE_2D, $bottom->{name};
376
377 glColor 1, 1, 1, 0.8;
378
379 glBegin GL_QUADS;
380 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
381 glTexCoord 0, 1; glVertex 0 , $h;
382 glTexCoord 1, 1; glVertex $w , $h;
383 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
384 glEnd;
385
386 my $bg = $self->{txts}->[0];
387 glBindTexture GL_TEXTURE_2D, $bg->{name};
388 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
389 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
390
391 glColor 1, 1, 1, 0.8;
392
393 my $rep_x = $cw / $bg->{width};
394 my $rep_y = $ch / $bg->{height};
395
396 glBegin GL_QUADS;
397 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
398 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
399 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
400 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
401 glEnd;
402
403 $self->get->draw;
404 756
405 glDisable GL_BLEND; 757 glDisable GL_BLEND;
406 glDisable GL_TEXTURE_2D; 758 glDisable GL_TEXTURE_2D;
407} 759}
408 760
409package Crossfire::Client::Widget::Table; 761#############################################################################
410 762
411our @ISA = Crossfire::Client::Widget::Bin::;
412
413use SDL::OpenGL;
414
415sub add {
416 my ($self, $x, $y, $chld) = @_;
417 my $old_chld = $self->{childs}[$y][$x];
418
419 $self->{childs}[$y][$x] = $chld;
420 $chld->set_parent ($self);
421 $self->update;
422}
423
424sub max_row_height {
425 my ($self, $row) = @_;
426
427 my $hs = 0;
428 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) {
429 my $c = $self->{childs}->[$row]->[$xi];
430 if ($c) {
431 my ($w, $h) = $c->size_request;
432 if ($hs < $h) { $hs = $h }
433 }
434 }
435 return $hs;
436}
437
438sub max_col_width {
439 my ($self, $col) = @_;
440
441 my $ws = 0;
442 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) {
443 my $c = ($self->{childs}->[$yi] || [])->[$col];
444 if ($c) {
445 my ($w, $h) = $c->size_request;
446 if ($ws < $w) { $ws = $w }
447 }
448 }
449 return $ws;
450}
451
452sub size_request {
453 my ($self) = @_;
454
455 my ($hs, $ws) = (0, 0);
456
457 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
458 $hs += $self->max_row_height ($yi);
459 }
460
461 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
462 my $wm = 0;
463 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
464 $wm += $self->max_col_width ($xi)
465 }
466 if ($ws < $wm) { $ws = $wm }
467 }
468
469 return ($ws, $hs);
470}
471
472sub _draw {
473 my ($self) = @_;
474
475 my $y = 0;
476 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) {
477 my $x = 0;
478
479 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
480
481 my $c = $self->{childs}->[$yi]->[$xi];
482 if ($c) {
483 $c->move ($x, $y, 0); #TODO: Move to size_request
484 $c->draw if $c;
485 }
486
487 $x += $self->max_col_width ($xi);
488 }
489
490 $y += $self->max_row_height ($yi);
491 }
492}
493
494package Crossfire::Client::Widget::VBox;
495
496our @ISA = Crossfire::Client::Widget::Bin::;
497
498use SDL::OpenGL;
499
500sub add {
501 my ($self, $chld) = @_;
502 push @{$self->{childs}}, $chld;
503 $chld->set_parent ($self);
504 $self->update;
505}
506
507sub size_request {
508 my ($self) = @_;
509
510 my ($hs, $ws) = (0, 0);
511 for (@{$self->{childs} || []}) {
512 my ($w, $h) = $_->size_request;
513 $hs += $h;
514 if ($ws < $w) { $ws = $w }
515 }
516
517 return ($ws, $hs);
518}
519
520sub _draw {
521 my ($self) = @_;
522
523 my ($x, $y);
524 for (@{$self->{childs} || []}) {
525 $_->move (0, $y, 0); #TODO: move to size_request
526 $_->draw;
527 my ($w, $h) = $_->size_request;
528 $y += $h;
529 }
530}
531
532package Crossfire::Client::Widget::Label;
533
534our @ISA = Crossfire::Client::Widget::;
535
536use SDL::OpenGL;
537
538sub new {
539 my ($class, $x, $y, $z, $height, $text) = @_;
540
541 # TODO: color, and make height, xyz etc. optional
542 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
543
544 $self->set_text ($text);
545
546 $self
547}
548
549sub set_text {
550 my ($self, $text) = @_;
551
552 $self->{text} = $text;
553 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
554
555 $self->update;
556}
557
558sub get_text {
559 my ($self, $text) = @_;
560
561 $self->{text}
562}
563
564sub size_request {
565 my ($self) = @_;
566
567 (
568 $self->{texture}{width},
569 $self->{texture}{height},
570 )
571}
572
573sub _draw {
574 my ($self) = @_;
575
576 my $tex = $self->{texture};
577
578 glEnable GL_BLEND;
579 glEnable GL_TEXTURE_2D;
580 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
581 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
582 glBindTexture GL_TEXTURE_2D, $tex->{name};
583
584 glColor 1, 1, 1, 0.6; # TODO color
585
586 glBegin GL_QUADS;
587 glTexCoord 0, 0; glVertex 0 , 0;
588 glTexCoord 0, 1; glVertex 0 , $tex->{height};
589 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
590 glTexCoord 1, 0; glVertex $tex->{width}, 0;
591 glEnd;
592
593 glDisable GL_BLEND;
594 glDisable GL_TEXTURE_2D;
595}
596
597package Crossfire::Client::Widget::TextEntry; 763package CFClient::Widget::Entry;
598 764
599our @ISA = Crossfire::Client::Widget::Label::; 765our @ISA = CFClient::Widget::Label::;
600 766
601use SDL; 767use SDL;
602use SDL::OpenGL; 768use SDL::OpenGL;
603 769
604sub key_down { 770sub key_down {
605 my ($self, $ev) = @_; 771 my ($self, $ev) = @_;
606 772
607 my $mod = $ev->key_mod; 773 my $mod = $ev->key_mod;
608 my $sym = $ev->key_sym; 774 my $sym = $ev->key_sym;
609 775
610 $ev->set_unicode (1);
611 my $uni = $ev->key_unicode; 776 my $uni = $ev->key_unicode;
612 777
613 my $text = $self->get_text; 778 my $text = $self->get_text;
614 779
615 if ($sym == SDLK_BACKSPACE) { 780 if ($sym == SDLK_BACKSPACE) {
616 substr $text, -1, 1, ''; 781 substr $text, -1, 1, '';
617
618 } elsif ($uni) { 782 } elsif ($uni) {
619 $text .= chr $uni; 783 $text .= chr $uni;
620 } 784 }
785
621 $self->set_text ($text); 786 $self->set_text ($text);
622} 787}
623 788
789sub button_down {
790 my ($self, $ev) = @_;
624 791
625# XXX: TextView isn't neccessary with pango multiline text rendering 792 $self->focus_in;
626package Crossfire::Client::Widget::TextView; 793}
627 794
628use strict; 795sub mouse_motion {
629
630our @ISA = qw/Crossfire::Client::Widget/;
631
632use SDL::OpenGL;
633use SDL::OpenGL::Constants;
634
635sub new {
636 my ($class, $text, $h) = @_; 796 my ($self, $ev, $x, $y) = @_;
637 my $self = $class->SUPER::new (); 797 printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
638
639 $self->{txt_height} = $h;
640 @{$self->{lines}} = split /\r?\n/, $text;
641
642 for (split /\r?\n/, $text) {
643 $self->add_line ($_);
644 }
645 $self
646} 798}
647 799
648#sub render_lines { 800sub _draw {
649# my ($self) = @_; 801 my ($self) = @_;
650# 802
651# $self->{txt_lines} = []; 803 if ($FOCUS == $self) {
652# 804 glColor 1, 1, 1;
653# for (@{$self->{lines}}) { 805 } else {
654# push @{$self->{txt_lines}}, 806 glColor 0.7, 0.7, 0.7;
655# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
656# } 807 }
657#}
658
659sub add_line {
660 my ($self, $line) = @_;
661 push @{$self->{lines}}, $line;
662
663 push @{$self->{txt_lines}},
664 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
665}
666
667sub size_request {
668 my ($self) = @_;
669
670 my $w = 0;
671 my $h = 0;
672
673 for (@{$self->{txt_lines}}) {
674 if ($w < $_->{width}) { $w = $_->{width} }
675 $h += $_->{height};
676 }
677
678 return ($w, $h);
679}
680
681sub draw_line {
682 my ($self, $tex, $y) = @_;
683
684 glBindTexture GL_TEXTURE_2D, $tex->{name};
685
686 glColor 1, 0, 1;
687 808
688 glBegin GL_QUADS; 809 glBegin GL_QUADS;
689 glTexCoord 0, 0; glVertex 0 , $y; 810 glVertex 0 , 0;
690 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height}; 811 glVertex 0 , $self->{h} - 1;
691 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height}; 812 glVertex $self->{w} - 1, $self->{h} - 1;
692 glTexCoord 1, 0; glVertex $tex->{width}, $y; 813 glVertex $self->{w} - 1, 0;
693 glEnd; 814 glEnd;
694}
695 815
696sub _draw { 816 $self->SUPER::_draw;
697 my ($self) = @_;
698
699 glEnable GL_BLEND;
700 glEnable GL_TEXTURE_2D;
701 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
702
703 my $l = 0;
704 for (@{$self->{txt_lines}}) {
705 $self->draw_line ($_, $l);
706 $l += $_->{height};
707 }
708
709 glDisable GL_BLEND;
710 glDisable GL_TEXTURE_2D;
711} 817}
712 818
819#############################################################################
820
713package Crossfire::Client::Widget::MapWidget; 821package CFClient::Widget::MapWidget;
714 822
715use strict; 823use strict;
716 824
717use List::Util qw(min max); 825use List::Util qw(min max);
718 826
719use SDL; 827use SDL;
720use SDL::OpenGL; 828use SDL::OpenGL;
721use SDL::OpenGL::Constants; 829use SDL::OpenGL::Constants;
722 830
723our @ISA = Crossfire::Client::Widget::; 831our @ISA = CFClient::Widget::;
832
833sub new {
834 my $class = shift;
835
836 $class->SUPER::new (
837 z => -1,
838 list => (glGenLists 1),
839 @_
840 )
841}
724 842
725sub key_down { 843sub key_down {
726 print "MAPKEYDOWN\n"; 844 print "MAPKEYDOWN\n";
727} 845}
728 846
729sub key_up { 847sub key_up {
730} 848}
731 849
850sub size_request {
851 (
852 1 + int $::WIDTH / 32,
853 1 + int $::HEIGHT / 32,
854 )
855}
856
857sub update {
858 my ($self) = @_;
859
860 $self->{need_update} = 1;
861}
862
732sub _draw { 863sub _draw {
733 my ($self) = @_; 864 my ($self) = @_;
734 865
866 if (delete $self->{need_update}) {
867 glNewList $self->{list}, GL_COMPILE;
868
735 my $mx = $::CONN->{mapx}; 869 my $mx = $::CONN->{mapx};
736 my $my = $::CONN->{mapy}; 870 my $my = $::CONN->{mapy};
737 871
738 my $map = $::CONN->{map}; 872 my $map = $::CONN->{map};
739 873
740 my ($xofs, $yofs); 874 my ($xofs, $yofs);
741 875
742 my $sw = 1 + int $::WIDTH / 32; 876 my $sw = 1 + int $::WIDTH / 32;
743 my $sh = 1 + int $::HEIGHT / 32; 877 my $sh = 1 + int $::HEIGHT / 32;
744 878
745 if ($::CONN->{mapw} > $sw) { 879 if ($::CONN->{mapw} > $sw) {
746 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5; 880 $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
747 } else { 881 } else {
748 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs}; 882 $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
749 } 883 }
750 884
751 if ($::CONN->{maph} > $sh) { 885 if ($::CONN->{maph} > $sh) {
752 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5; 886 $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
753 } else { 887 } else {
754 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 888 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
755 } 889 }
756 890
757 glEnable GL_TEXTURE_2D; 891 glEnable GL_TEXTURE_2D;
758 glEnable GL_BLEND; 892 glEnable GL_BLEND;
759 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 893 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
760 894
761 my $sw4 = ($sw + 3) & ~3; 895 my $sw4 = ($sw + 3) & ~3;
762 my $lighting = "\x00" x ($sw4 * $sh); 896 my $darkness = "\x00" x ($sw4 * $sh);
763 897
764 for my $x (0 .. $sw - 1) { 898 for my $x (0 .. $sw - 1) {
899 my $row = $map->[$x + $xofs];
765 for my $y (0 .. $sh - 1) { 900 for my $y (0 .. $sh - 1) {
766 901
767 my $cell = $map->[$x + $xofs][$y + $yofs] 902 my $cell = $row->[$y + $yofs]
768 or next; 903 or next;
769 904
770 my $darkness = $cell->[0] * (1 / 255); 905 my $dark = $cell->[0];
771 if ($darkness < 0) { 906 if ($dark < 0) {
772 $darkness = 0.15; 907 substr $darkness, $y * $sw4 + $x, 1, chr 224;
908 } else {
909 substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
773 } 910 }
774 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
775 911
776 for my $num (grep $_, @$cell[1,2,3]) { 912 for my $num (grep $_, @$cell[1,2,3]) {
777 my $tex = $::CONN->{face}[$num]{texture} || next; 913 my $tex = $::CONN->{face}[$num]{texture} || next;
778 914
779 glBindTexture GL_TEXTURE_2D, $tex->{name};
780
781 my $w = $tex->{width}; 915 my $w = $tex->{width};
782 my $h = $tex->{height}; 916 my $h = $tex->{height};
783 917
784 my $px = ($x + 1) * 32 - $w; 918 $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
785 my $py = ($y + 1) * 32 - $h;
786
787 glBegin GL_QUADS;
788 glTexCoord 0, 0; glVertex $px , $py;
789 glTexCoord 0, 1; glVertex $px , $py + $h;
790 glTexCoord 1, 1; glVertex $px + $w, $py + $h;
791 glTexCoord 1, 0; glVertex $px + $w, $py;
792 glEnd; 919 }
793 } 920 }
794 } 921 }
795 }
796 922
797# if (1) { # higher quality darkness 923# if (1) { # higher quality darkness
798# $lighting =~ s/(.)/$1$1$1/gs; 924# $lighting =~ s/(.)/$1$1$1/gs;
799# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3; 925# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
800# 926#
… …
802# 928#
803# $lighting = $pb->get_pixels; 929# $lighting = $pb->get_pixels;
804# $lighting =~ s/(.)../$1/gs; 930# $lighting =~ s/(.)../$1/gs;
805# } 931# }
806 932
807 $lighting = new Crossfire::Client::Texture
808 width => $sw4,
809 height => $sh,
810 data => $lighting,
811 internalformat => GL_ALPHA4,
812 format => GL_ALPHA;
813
814 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 933 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
815 glColor 0, 0, 0, 0.75;
816 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 934 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
817 glBindTexture GL_TEXTURE_2D, $lighting->{name};
818 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
819 glBegin GL_QUADS;
820 glTexCoord 0, 0; glVertex 0 , 0;
821 glTexCoord 0, 1; glVertex 0 , $sh * 32;
822 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
823 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
824 glEnd;
825 935
936 $darkness = new CFClient::Texture
937 width => $sw4,
938 height => $sh,
939 data => $darkness,
940 internalformat => GL_ALPHA,
941 format => GL_ALPHA;
942
943 glColor 0.45, 0.45, 0.45, 1;
944 $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
945
826 glDisable GL_TEXTURE_2D; 946 glDisable GL_TEXTURE_2D;
827 glDisable GL_BLEND; 947 glDisable GL_BLEND;
948
949 glEndList;
950 }
951
952 glCallList $self->{list};
828} 953}
829 954
830my %DIR = ( 955my %DIR = (
831 SDLK_KP8, [1, "north"], 956 SDLK_KP8, [1, "north"],
832 SDLK_KP9, [2, "northeast"], 957 SDLK_KP9, [2, "northeast"],
… …
876 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 1001 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
877 $::CONN->send ("command run_stop"); 1002 $::CONN->send ("command run_stop");
878 } 1003 }
879} 1004}
880 1005
1006#############################################################################
1007
881package Crossfire::Client::Widget::Animator; 1008package CFClient::Widget::Animator;
882 1009
883use SDL::OpenGL; 1010use SDL::OpenGL;
884 1011
885our @ISA = Crossfire::Client::Widget::Bin::; 1012our @ISA = CFClient::Widget::Bin::;
886 1013
887sub moveto { 1014sub moveto {
888 my ($self, $x, $y) = @_; 1015 my ($self, $x, $y) = @_;
889 1016
890 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y]; 1017 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
891 $self->{speed} = 0.01; 1018 $self->{speed} = 0.001;
892 $self->{time} = 1; 1019 $self->{time} = 1;
893 1020
894 ::animation_start $self; 1021 ::animation_start $self;
895} 1022}
896 1023
… …
911 1038
912sub _draw { 1039sub _draw {
913 my ($self) = @_; 1040 my ($self) = @_;
914 1041
915 glPushMatrix; 1042 glPushMatrix;
916 glRotate $self->{time} * 10000, 0, 1, 0; 1043 glRotate $self->{time} * 1000, 0, 1, 0;
917 $self->{child}->draw; 1044 $self->{children}[0]->draw;
918 glPopMatrix; 1045 glPopMatrix;
919} 1046}
920 1047
9211; 1048#############################################################################
922 1049
1050package CFClient::Widget::Toplevel;
1051
1052our @ISA = CFClient::Widget::Container::;
1053
1054sub size_request {
1055 ($::WIDTH, $::HEIGHT)
1056}
1057
1058sub size_allocate {
1059 my ($self, $w, $h) = @_;
1060
1061 $self->SUPER::size_allocate ($w, $h);
1062
1063 $_->size_allocate ($_->size_request)
1064 for @{$self->{children}};
1065}
1066
1067sub translate {
1068 my ($self, $x, $y) = @_;
1069
1070 ($x, $y)
1071}
1072
1073sub update {
1074 my ($self) = @_;
1075
1076 $self->size_allocate ($self->size_request);
1077 ::refresh ();
1078}
1079
1080sub add {
1081 my ($self, $widget) = @_;
1082
1083 $self->SUPER::add ($widget);
1084
1085 $widget->size_allocate ($widget->size_request);
1086}
1087
1088sub draw {
1089 my ($self) = @_;
1090
1091 $self->_draw;
1092}
1093
1094#############################################################################
1095
1096package CFClient::Widget;
1097
1098$TOPLEVEL = new CFClient::Widget::Toplevel;
1099
11001
1101

Diff Legend

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