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.31 by elmex, Sun Apr 9 00:43:11 2006 UTC vs.
Revision 1.50 by root, Sun Apr 9 22:27:24 2006 UTC

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 Crossfire::Client;
11our @ACTIVE_WIDGETS;
12 11
13# class methods for events 12# class methods for events
14sub feed_sdl_key_down_event { $FOCUS->key_down ($_[0]) if $FOCUS } 13sub feed_sdl_key_down_event { $::FOCUS->key_down ($_[0]) if $::FOCUS }
15sub feed_sdl_key_up_event { $FOCUS->key_up ($_[0]) if $FOCUS } 14sub feed_sdl_key_up_event { $::FOCUS->key_up ($_[0]) if $::FOCUS }
16sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS } 15sub feed_sdl_button_down_event { }
17sub feed_sdl_button_up_event { $FOCUS->button_up ($_[0]) if $FOCUS } 16sub feed_sdl_button_up_event { }
18 17
19sub new { 18sub new {
20 my $class = shift; 19 my $class = shift;
21 20
22 bless { @_ }, $class 21 bless { @_ }, $class
23}
24
25sub activate {
26 push @ACTIVE_WIDGETS, $_[0];
27 Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
28}
29
30sub deactivate {
31 @ACTIVE_WIDGETS =
32 sort { $a->{z} <=> $b->{z} }
33 grep { $_ && $_ != $_[0] }
34 @ACTIVE_WIDGETS;
35} 22}
36 23
37sub move { 24sub move {
38 my ($self, $x, $y, $z) = @_; 25 my ($self, $x, $y, $z) = @_;
39 $self->{x} = $x; 26 $self->{x} = $x;
44sub needs_redraw { 31sub needs_redraw {
45 0 32 0
46} 33}
47 34
48sub size_request { 35sub size_request {
36 require Carp;
49 die "size_request is abtract"; 37 Carp::confess "size_request is abtract";
38}
39
40sub size_allocate {
41 my ($self, $w, $h) = @_;
42
43 $self->{w} = $w;
44 $self->{h} = $h;
50} 45}
51 46
52sub focus_in { 47sub focus_in {
53 my ($widget) = @_; 48 my ($widget) = @_;
54 $FOCUS = $widget; 49 $::FOCUS = $widget;
55} 50}
56 51
57sub focus_out { 52sub focus_out {
58 my ($widget) = @_; 53 my ($widget) = @_;
59} 54}
72 67
73sub button_up { 68sub button_up {
74 my ($widget, $sdlev) = @_; 69 my ($widget, $sdlev) = @_;
75} 70}
76 71
77sub w { $_[0]->{w} } 72sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
78sub h { $_[0]->{h} } 73sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
79sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} } 74sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
80sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} } 75sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
81sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} } 76sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
82 77
83sub draw { 78sub draw {
84 my ($self) = @_; 79 my ($self) = @_;
85 80
86 glPushMatrix; 81 glPushMatrix;
87 glTranslate $self->{x}, $self->{y}, 0; 82 glTranslate $self->{x}, $self->{y}, 0;
88 $self->_draw; 83 $self->_draw;
84 if ($self == $::HOVER) {
85 glColor 1, 1, 1, 0.4;
86 glEnable GL_BLEND;
87 glBegin GL_QUADS;
88 glVertex 0, 0;
89 glVertex $self->{w} - 1, 0;
90 glVertex $self->{w} - 1, $self->{h} - 1;
91 glVertex 0, $self->{h} - 1;
92 glEnd;
93 glDisable GL_BLEND;
94 }
89 glPopMatrix; 95 glPopMatrix;
90} 96}
91 97
92sub _draw { 98sub _draw {
93 my ($widget) = @_; 99 my ($self) = @_;
100
101 warn "no draw defined for $self\n";
94} 102}
95 103
96sub bbox { 104sub bbox {
97 my ($widget) = @_; 105 my ($self) = @_;
106 my ($w, $h) = $self->size_request;
107 (
108 $self->{x},
109 $self->{y},
110 $self->{x} = $w,
111 $self->{y} = $h
112 )
113}
114
115sub find_widget {
116 my ($self, $x, $y) = @_;
117
118 return $self
119 if $x >= $self->{x} && $x < $self->{x} + $self->{w}
120 && $y >= $self->{y} && $y < $self->{y} + $self->{h};
121
122 ()
123}
124
125sub del_parent { $_[0]->{parent} = undef }
126
127sub set_parent {
128 my ($self, $par) = @_;
129
130 $self->{parent} = $par;
131 Scalar::Util::weaken $self->{parent};
132}
133
134sub get_parent {
135 $_[0]->{parent}
136}
137
138sub update {
139 my ($self) = @_;
140
141 $self->{parent}->update
142 if $self->{parent};
98} 143}
99 144
100sub DESTROY { 145sub DESTROY {
101 my ($self) = @_; 146 my ($self) = @_;
102 147
103 $self->deactivate; 148 #$self->deactivate;
104} 149}
150
151#############################################################################
105 152
106package Crossfire::Client::Widget::Container; 153package Crossfire::Client::Widget::Container;
107 154
108our @ISA = Crossfire::Client::Widget::; 155our @ISA = Crossfire::Client::Widget::;
109 156
157sub new {
158 my ($class, @widgets) = @_;
159
160 my $self = $class->SUPER::new (children => []);
161 $self->add ($_) for @widgets;
162
163 $self
164}
165
166sub add {
167 my ($self, $chld, $expand) = @_;
168
169 $chld->{expand} = $expand;
170 $chld->set_parent ($self);
171
172 @{$self->{children}} =
173 sort { $a->{z} <=> $b->{z} }
174 @{$self->{children}}, $chld;
175
176 $self->size_allocate ($self->{w}, $self->{h})
177 if $self->{w}; #TODO: check for "realised state"
178}
179
180sub remove {
181 my ($self, $widget) = @_;
182
183 $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
184
185 $self->size_allocate ($self->{w}, $self->{h});
186}
187
188sub find_widget {
189 my ($self, $x, $y) = @_;
190
191 $x -= $self->{x};
192 $y -= $self->{y};
193
194 my $res;
195
196 for (reverse @{ $self->{children} }) {
197 $res = $_->find_widget ($x, $y)
198 and return $res;
199 }
200
201 $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
202}
203
204sub _draw {
205 my ($self) = @_;
206
207 $_->draw for @{$self->{children}};
208}
209
210#############################################################################
211
212package Crossfire::Client::Widget::Bin;
213
214our @ISA = Crossfire::Client::Widget::Container::;
215
216sub child { $_[0]->{children}[0] }
217
218sub size_request {
219 $_[0]{children}[0]->size_request if $_[0]{children}[0];
220}
221
222sub size_allocate {
223 my ($self, $w, $h) = @_;
224
225 $self->SUPER::size_allocate ($w, $h);
226 $self->{children}[0]->size_allocate ($w, $h)
227 if $self->{children}[0]
228}
229
230#############################################################################
231
232package Crossfire::Client::Widget::Toplevel;
233
234our @ISA = Crossfire::Client::Widget::Container::;
235
236sub update {
237 my ($self) = @_;
238
239 ::refresh ();
240}
241
242sub add {
243 my ($self, $widget) = @_;
244
245 $self->SUPER::add ($widget);
246
247 $widget->size_allocate ($widget->size_request);
248}
249
250#############################################################################
251
252package Crossfire::Client::Widget::Window;
253
254our @ISA = Crossfire::Client::Widget::Bin::;
255
110use SDL::OpenGL; 256use SDL::OpenGL;
111 257
112sub add { $_[0]->{child} = $_[1] } 258sub new {
113sub get { $_[0]->{child} } 259 my ($class, $x, $y, $z, $w, $h) = @_;
114 260
115sub size_request { $_[0]->{child}->size_request if $_[0]->{child} } 261 my $self = $class->SUPER::new;
116 262
117sub _draw { die "Containers can't be drawn!" } 263 @$self{qw(x y z w h)} = ($x, $y, $z, $w, $h);
264}
118 265
119package Crossfire::Client::Widget::Window; 266sub update {
120
121our @ISA = Crossfire::Client::Widget::Container::;
122
123use SDL::OpenGL;
124
125sub add {
126 my ($self, $chld) = @_; 267 my ($self) = @_;
127 $self->SUPER::add ($chld); 268
128 $self->render_chld; #TODO: Move this to the size_request event propably? 269 $self->render_chld;
270 $self->SUPER::update;
129} 271}
130 272
131sub render_chld { 273sub render_chld {
132 my ($self) = @_; 274 my ($self) = @_;
133 my $chld = $self->get;
134 my ($w, $h) = $self->size_request;
135 275
136 $self->{texture} = 276 $self->{texture} =
137 Crossfire::Client::Texture->new_from_opengl ( 277 Crossfire::Client::Texture->new_from_opengl (
138 $w, $h, sub { $chld->draw } 278 $self->{w}, $self->{h}, sub { $self->child->draw }
139 ); 279 );
140 $self->{texture}->upload;
141} 280}
142 281
143sub size_request { 282sub size_allocate {
144 my ($self) = @_; 283 my ($self, $w, $h) = @_;
145 my $chld = $self->get 284
146 or return (0, 0); 285 $self->{w} = $w;
147 $chld->size_request 286 $self->{h} = $h;
287
288 $self->child->size_allocate ($w, $h);
289
290 $self->render_chld;
148} 291}
149 292
150sub _draw { 293sub _draw {
151 my ($self) = @_; 294 my ($self) = @_;
152 295
153 my ($w, $h) = $self->size_request;#TODO# use width/height of texture 296 my ($w, $h) = ($self->w, $self->h);
154 297
155 my $tex = $self->{texture} 298 my $tex = $self->{texture}
156 or return; 299 or return;
157 300
158 glEnable GL_BLEND; 301 glEnable GL_BLEND;
159 glEnable GL_TEXTURE_2D; 302 glEnable GL_TEXTURE_2D;
160 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 303 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
161 glBindTexture GL_TEXTURE_2D, $tex->{name}; 304 glBindTexture GL_TEXTURE_2D, $tex->{name};
162
163 glColor 1, 0, 1;
164 305
165 glBegin GL_QUADS; 306 glBegin GL_QUADS;
166 glTexCoord 0, 0; glVertex 0, 0; 307 glTexCoord 0, 0; glVertex 0, 0;
167 glTexCoord 0, 1; glVertex 0, $h; 308 glTexCoord 0, 1; glVertex 0, $h;
168 glTexCoord 1, 1; glVertex $w, $h; 309 glTexCoord 1, 1; glVertex $w, $h;
171 312
172 glDisable GL_BLEND; 313 glDisable GL_BLEND;
173 glDisable GL_TEXTURE_2D; 314 glDisable GL_TEXTURE_2D;
174} 315}
175 316
317#############################################################################
318
176package Crossfire::Client::Widget::Frame; 319package Crossfire::Client::Widget::Frame;
177 320
178our @ISA = Crossfire::Client::Widget::Container::; 321our @ISA = Crossfire::Client::Widget::Bin::;
179 322
180use SDL::OpenGL; 323use SDL::OpenGL;
181 324
182sub size_request { 325sub size_request {
183 my ($self) = @_; 326 my ($self) = @_;
184 my $chld = $self->get 327 my $chld = $self->child
185 or return (0, 0); 328 or return (0, 0);
186 329
187 $chld->move (2, 2); 330 $chld->move (2, 2);
188 331
189 map { $_ + 4 } $chld->size_request; 332 map { $_ + 4 } $chld->size_request;
190} 333}
191 334
335sub size_allocate {
336 my ($self, $w, $h) = @_;
337
338 $self->{w} = $w;
339 $self->{h} = $h;
340
341 $self->child->size_allocate ($w - 4, $h - 4);
342 $self->child->move (2, 2);
343}
344
192sub _draw { 345sub _draw {
193 my ($self) = @_; 346 my ($self) = @_;
194 347
195 my $chld = $self->get; 348 my $chld = $self->child;
196 349
197 my ($w, $h) = $chld->size_request; 350 my ($w, $h) = $chld->size_request;
198 351
199 glBegin GL_QUADS; 352 glBegin GL_QUADS;
200 glColor 0, 0, 0; 353 glColor 0, 0, 0;
205 glEnd; 358 glEnd;
206 359
207 $chld->draw; 360 $chld->draw;
208} 361}
209 362
363#############################################################################
364
210package Crossfire::Client::Widget::FancyFrame; 365package Crossfire::Client::Widget::FancyFrame;
211 366
212our @ISA = Crossfire::Client::Widget::Frame::; 367our @ISA = Crossfire::Client::Widget::Bin::;
213 368
214use SDL::OpenGL; 369use SDL::OpenGL;
215 370
216#TODO: implement themed frame 371my @tex =
372 map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
373 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
374
375sub size_request {
376 my ($self) = @_;
377
378 my ($w, $h) = $self->SUPER::size_request;
379
380 $h += $tex[1]->{height};
381 $h += $tex[4]->{height};
382 $w += $tex[2]->{width};
383 $w += $tex[3]->{width};
384
385 ($w, $h)
386}
387
388sub size_allocate {
389 my ($self, $w, $h) = @_;
390
391 $self->SUPER::size_allocate ($w, $h);
392
393 $h -= $tex[1]->{height};
394 $h -= $tex[4]->{height};
395 $w -= $tex[2]->{width};
396 $w -= $tex[3]->{width};
397
398 $h = $h < 0 ? 0 : $h;
399 $w = $w < 0 ? 0 : $w;
400
401 $self->child->size_allocate ($w, $h);
402 $self->child->move ($tex[3]->{width}, $tex[1]->{height});
403}
404
405sub _draw {
406 my ($self) = @_;
407
408 my ($w, $h) = ($self->{w}, $self->{h});
409 my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
410
411 glEnable GL_BLEND;
412 glEnable GL_TEXTURE_2D;
413 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
414 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
415
416 my $top = $tex[1];
417 glBindTexture GL_TEXTURE_2D, $top->{name};
418
419 glBegin GL_QUADS;
420 glTexCoord 0, 0; glVertex 0 , 0;
421 glTexCoord 0, 1; glVertex 0 , $top->{height};
422 glTexCoord 1, 1; glVertex $w , $top->{height};
423 glTexCoord 1, 0; glVertex $w , 0;
424 glEnd;
425
426 my $left = $tex[3];
427 glBindTexture GL_TEXTURE_2D, $left->{name};
428
429 glBegin GL_QUADS;
430 glTexCoord 0, 0; glVertex 0 , $top->{height};
431 glTexCoord 0, 1; glVertex 0 , $top->{height} + $ch;
432 glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
433 glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
434 glEnd;
435
436 my $right = $tex[2];
437 glBindTexture GL_TEXTURE_2D, $right->{name};
438
439 glBegin GL_QUADS;
440 glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
441 glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
442 glTexCoord 1, 1; glVertex $w , $top->{height} + $ch;
443 glTexCoord 1, 0; glVertex $w , $top->{height};
444 glEnd;
445
446 my $bottom = $tex[4];
447 glBindTexture GL_TEXTURE_2D, $bottom->{name};
448
449 glBegin GL_QUADS;
450 glTexCoord 0, 0; glVertex 0 , $h - $bottom->{height};
451 glTexCoord 0, 1; glVertex 0 , $h;
452 glTexCoord 1, 1; glVertex $w , $h;
453 glTexCoord 1, 0; glVertex $w , $h - $bottom->{height};
454 glEnd;
455
456 my $bg = $tex[0];
457 glBindTexture GL_TEXTURE_2D, $bg->{name};
458 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
459 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
460 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
461
462 my $rep_x = $cw / $bg->{width};
463 my $rep_y = $ch / $bg->{height};
464
465 glBegin GL_QUADS;
466 glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
467 glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
468 glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
469 glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
470 glEnd;
471
472 glDisable GL_BLEND;
473 glDisable GL_TEXTURE_2D;
474
475 $self->child->draw;
476
477}
478
479#############################################################################
217 480
218package Crossfire::Client::Widget::Table; 481package Crossfire::Client::Widget::Table;
219 482
220our @ISA = Crossfire::Client::Widget::Container::; 483our @ISA = Crossfire::Client::Widget::Bin::;
221 484
222use SDL::OpenGL; 485use SDL::OpenGL;
223 486
224sub add { 487sub add {
225 my ($self, $x, $y, $chld) = @_; 488 my ($self, $x, $y, $chld) = @_;
489 my $old_chld = $self->{children}[$y][$x];
490
226 $self->{childs}[$y][$x] = $chld; 491 $self->{children}[$y][$x] = $chld;
492 $chld->set_parent ($self);
493 $self->update;
227} 494}
228 495
229sub max_row_height { 496sub max_row_height {
230 my ($self, $row) = @_; 497 my ($self, $row) = @_;
231 498
232 my $hs = 0; 499 my $hs = 0;
233 for (my $xi = 0; $xi <= $#{$self->{childs}->[$row] || []}; $xi++) { 500 for (my $xi = 0; $xi <= $#{$self->{children}->[$row] || []}; $xi++) {
234 my $c = $self->{childs}->[$row]->[$xi]; 501 my $c = $self->{children}->[$row]->[$xi];
235 if ($c) { 502 if ($c) {
236 my ($w, $h) = $c->size_request; 503 my ($w, $h) = $c->size_request;
237 if ($hs < $h) { $hs = $h } 504 if ($hs < $h) { $hs = $h }
238 } 505 }
239 } 506 }
242 509
243sub max_col_width { 510sub max_col_width {
244 my ($self, $col) = @_; 511 my ($self, $col) = @_;
245 512
246 my $ws = 0; 513 my $ws = 0;
247 for (my $yi = 0; $yi <= $#{$self->{childs} || []}; $yi++) { 514 for (my $yi = 0; $yi <= $#{$self->{children} || []}; $yi++) {
248 my $c = ($self->{childs}->[$yi] || [])->[$col]; 515 my $c = ($self->{children}->[$yi] || [])->[$col];
249 if ($c) { 516 if ($c) {
250 my ($w, $h) = $c->size_request; 517 my ($w, $h) = $c->size_request;
251 if ($ws < $w) { $ws = $w } 518 if ($ws < $w) { $ws = $w }
252 } 519 }
253 } 520 }
257sub size_request { 524sub size_request {
258 my ($self) = @_; 525 my ($self) = @_;
259 526
260 my ($hs, $ws) = (0, 0); 527 my ($hs, $ws) = (0, 0);
261 528
262 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 529 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
263 $hs += $self->max_row_height ($yi); 530 $hs += $self->max_row_height ($yi);
264 } 531 }
265 532
266 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 533 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
267 my $wm = 0; 534 my $wm = 0;
268 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 535 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
269 $wm += $self->max_col_width ($xi) 536 $wm += $self->max_col_width ($xi)
270 } 537 }
271 if ($ws < $wm) { $ws = $wm } 538 if ($ws < $wm) { $ws = $wm }
272 } 539 }
273 540
276 543
277sub _draw { 544sub _draw {
278 my ($self) = @_; 545 my ($self) = @_;
279 546
280 my $y = 0; 547 my $y = 0;
281 for (my $yi = 0; $yi <= $#{$self->{childs}}; $yi++) { 548 for (my $yi = 0; $yi <= $#{$self->{children}}; $yi++) {
282 my $x = 0; 549 my $x = 0;
283 550
284 for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) { 551 for (my $xi = 0; $xi <= $#{$self->{children}->[$yi]}; $xi++) {
285 552
286 my $c = $self->{childs}->[$yi]->[$xi]; 553 my $c = $self->{children}->[$yi]->[$xi];
287 if ($c) { 554 if ($c) {
288 $c->move ($x, $y, 0); #TODO: Move to size_request 555 $c->move ($x, $y, 0); #TODO: Move to size_request
289 $c->draw if $c; 556 $c->draw if $c;
290 } 557 }
291 558
294 561
295 $y += $self->max_row_height ($yi); 562 $y += $self->max_row_height ($yi);
296 } 563 }
297} 564}
298 565
566#############################################################################
567
299package Crossfire::Client::Widget::VBox; 568package Crossfire::Client::Widget::VBox;
300 569
301our @ISA = Crossfire::Client::Widget::Container::; 570our @ISA = Crossfire::Client::Widget::Container::;
302 571
303use SDL::OpenGL; 572use SDL::OpenGL;
304 573
305sub add {
306 my ($self, $chld) = @_;
307 push @{$self->{childs}}, $chld;
308}
309
310sub size_request { 574sub size_request {
311 my ($self) = @_; 575 my ($self) = @_;
312 576
313 my ($hs, $ws) = (0, 0); 577 my @alloc = map [$_->size_request], @{$self->{children}};
578
579 (
580 (List::Util::max map $_->[0], @alloc),
581 (List::Util::sum map $_->[1], @alloc),
582 )
583}
584
585sub size_allocate {
586 my ($self, $w, $h) = @_;
587
588 $self->w ($w);
589 $self->h ($h);
590
591 my $exp;
592 my @oth;
593 # find expand widget
314 for (@{$self->{childs} || []}) { 594 for (@{$self->{children}}) {
595 if ($_->{expand}) {
596 $exp = $_;
597 last;
598 }
599 push @oth, $_;
600 }
601
602 my ($ow, $oh);
603
604 # get sizes of other widgets
605 for (@oth) {
315 my ($w, $h) = $_->size_request; 606 my ($w, $h) = $_->size_request;
316 $hs += $h; 607 $oh += $h;
317 if ($ws < $w) { $ws = $w } 608 if ($ow < $w) { $ow = $w }
318 } 609 }
319 610
320 return ($ws, $hs); 611 my $y = 0;
321}
322
323sub _draw {
324 my ($self) = @_;
325
326 my ($x, $y);
327 for (@{$self->{childs} || []}) { 612 for (@{$self->{children}}) {
328 $_->move (0, $y, 0); #TODO: move to size_request 613 $_->move (0, $y);
329 $_->draw; 614
615 if ($_ == $exp) {
616 $_->size_allocate ($w, $h - $oh);
617 $y += $h - $oh;
618 } else {
330 my ($w, $h) = $_->size_request; 619 my ($cw, $h) = $_->size_request;
620 $_->size_allocate ($w, $h);
331 $y += $h; 621 $y += $h;
622 }
332 } 623 }
333} 624}
625
626#############################################################################
334 627
335package Crossfire::Client::Widget::Label; 628package Crossfire::Client::Widget::Label;
336 629
337our @ISA = Crossfire::Client::Widget::; 630our @ISA = Crossfire::Client::Widget::;
338 631
339use SDL::OpenGL; 632use SDL::OpenGL;
340 633
341sub new { 634sub new {
342 my ($class, $x, $y, $z, $height, $text) = @_; 635 my ($class, $x, $y, $z, $height, $text) = @_;
343 636
637 # TODO: color, and make height, xyz etc. optional
344 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height); 638 my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
345 639
346 $self->set_text ($text); 640 $self->set_text ($text);
347 641
348 $self 642 $self
350 644
351sub set_text { 645sub set_text {
352 my ($self, $text) = @_; 646 my ($self, $text) = @_;
353 647
354 $self->{text} = $text; 648 $self->{text} = $text;
355
356 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height}; 649 $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
650
651 $self->update;
357} 652}
358 653
359sub get_text { 654sub get_text {
360 my ($self, $text) = @_; 655 my ($self, $text) = @_;
361 656
380 glEnable GL_TEXTURE_2D; 675 glEnable GL_TEXTURE_2D;
381 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 676 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
382 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 677 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
383 glBindTexture GL_TEXTURE_2D, $tex->{name}; 678 glBindTexture GL_TEXTURE_2D, $tex->{name};
384 679
385 glColor 1, 1, 1, 0.8; 680 glColor 1, 0, 0, 1; # TODO color
386 681
387 glBegin GL_QUADS; 682 glBegin GL_QUADS;
388 glTexCoord 0, 0; glVertex 0 , 0; 683 glTexCoord 0, 0; glVertex 0 , 0;
389 glTexCoord 0, 1; glVertex 0 , $tex->{height}; 684 glTexCoord 0, 1; glVertex 0 , $tex->{height};
390 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height}; 685 glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
393 688
394 glDisable GL_BLEND; 689 glDisable GL_BLEND;
395 glDisable GL_TEXTURE_2D; 690 glDisable GL_TEXTURE_2D;
396} 691}
397 692
693#############################################################################
694
398package Crossfire::Client::Widget::TextEntry; 695package Crossfire::Client::Widget::TextEntry;
399 696
400our @ISA = Crossfire::Client::Widget::Label::; 697our @ISA = Crossfire::Client::Widget::Label::;
401 698
402use SDL; 699use SDL;
420 $text .= chr $uni; 717 $text .= chr $uni;
421 } 718 }
422 $self->set_text ($text); 719 $self->set_text ($text);
423} 720}
424 721
425 722#############################################################################
426# XXX: TextView isn't neccessary with pango multiline text rendering
427package Crossfire::Client::Widget::TextView;
428
429use strict;
430
431our @ISA = qw/Crossfire::Client::Widget/;
432
433use SDL::OpenGL;
434use SDL::OpenGL::Constants;
435
436sub new {
437 my ($class, $text, $h) = @_;
438 my $self = $class->SUPER::new ();
439
440 $self->{txt_height} = $h;
441 @{$self->{lines}} = split /\r?\n/, $text;
442
443 for (split /\r?\n/, $text) {
444 $self->add_line ($_);
445 }
446 $self
447}
448
449#sub render_lines {
450# my ($self) = @_;
451#
452# $self->{txt_lines} = [];
453#
454# for (@{$self->{lines}}) {
455# push @{$self->{txt_lines}},
456# new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
457# }
458#}
459
460sub add_line {
461 my ($self, $line) = @_;
462 push @{$self->{lines}}, $line;
463
464 push @{$self->{txt_lines}},
465 new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
466}
467
468sub size_request {
469 my ($self) = @_;
470
471 my $w = 0;
472 my $h = 0;
473
474 for (@{$self->{txt_lines}}) {
475 if ($w < $_->{width}) { $w = $_->{width} }
476 $h += $_->{height};
477 }
478
479 return ($w, $h);
480}
481
482sub draw_line {
483 my ($self, $tex, $y) = @_;
484
485 glBindTexture GL_TEXTURE_2D, $tex->{name};
486
487 glColor 1, 0, 1;
488
489 glBegin GL_QUADS;
490 glTexCoord 0, 0; glVertex 0 , $y;
491 glTexCoord 0, 1; glVertex 0 , $y + $tex->{height};
492 glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
493 glTexCoord 1, 0; glVertex $tex->{width}, $y;
494 glEnd;
495}
496
497sub _draw {
498 my ($self) = @_;
499
500 glEnable GL_BLEND;
501 glEnable GL_TEXTURE_2D;
502 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
503
504 my $l = 0;
505 for (@{$self->{txt_lines}}) {
506 $self->draw_line ($_, $l);
507 $l += $_->{height};
508 }
509
510 glDisable GL_BLEND;
511 glDisable GL_TEXTURE_2D;
512}
513 723
514package Crossfire::Client::Widget::MapWidget; 724package Crossfire::Client::Widget::MapWidget;
515 725
516use strict; 726use strict;
517 727
526sub key_down { 736sub key_down {
527 print "MAPKEYDOWN\n"; 737 print "MAPKEYDOWN\n";
528} 738}
529 739
530sub key_up { 740sub key_up {
741}
742
743sub size_request {
744
745}
746
747sub size_allocate {
531} 748}
532 749
533sub _draw { 750sub _draw {
534 my ($self) = @_; 751 my ($self) = @_;
535 752
555 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs}; 772 $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
556 } 773 }
557 774
558 glEnable GL_TEXTURE_2D; 775 glEnable GL_TEXTURE_2D;
559 glEnable GL_BLEND; 776 glEnable GL_BLEND;
560 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 777 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
778
779 my $sw4 = ($sw + 3) & ~3;
780 my $lighting = "\x00" x ($sw4 * $sh);
561 781
562 for my $x (0 .. $sw - 1) { 782 for my $x (0 .. $sw - 1) {
563 for my $y (0 .. $sh - 1) { 783 for my $y (0 .. $sh - 1) {
564 784
565 my $cell = $map->[$x + $xofs][$y + $yofs] 785 my $cell = $map->[$x + $xofs][$y + $yofs]
566 or next; 786 or next;
567 787
568 my $darkness = $cell->[0] * (1 / 255); 788 my $darkness = $cell->[0] * (1 / 255);
569 if ($darkness < 0) { 789 if ($darkness < 0) {
570 glColor 0.3, 0.3, 0.3; 790 $darkness = 0.15;
571 } else {
572 glColor $darkness, $darkness, $darkness;
573 } 791 }
792 substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
574 793
575 for my $num (grep $_, @$cell[1,2,3]) { 794 for my $num (grep $_, @$cell[1,2,3]) {
576 my $tex = $::CONN->{face}[$num]{texture} || next; 795 my $tex = $::CONN->{face}[$num]{texture} || next;
577 796
578 glBindTexture GL_TEXTURE_2D, $tex->{name}; 797 glBindTexture GL_TEXTURE_2D, $tex->{name};
590 glTexCoord 1, 0; glVertex $px + $w, $py; 809 glTexCoord 1, 0; glVertex $px + $w, $py;
591 glEnd; 810 glEnd;
592 } 811 }
593 } 812 }
594 } 813 }
814
815# if (1) { # higher quality darkness
816# $lighting =~ s/(.)/$1$1$1/gs;
817# my $pb = new_from_data Gtk2::Gdk::Pixbuf $lighting, "rgb", 0, 8, $sw4, $sh, $sw4 * 3;
818#
819# $pb = $pb->scale_simple ($sw4 * 0.5, $sh * 0.5, "bilinear");
820#
821# $lighting = $pb->get_pixels;
822# $lighting =~ s/(.)../$1/gs;
823# }
824
825 $lighting = new Crossfire::Client::Texture
826 width => $sw4,
827 height => $sh,
828 data => $lighting,
829 internalformat => GL_ALPHA4,
830 format => GL_ALPHA;
831
832 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
833 glColor 0, 0, 0, 0.75;
834 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
835 glBindTexture GL_TEXTURE_2D, $lighting->{name};
836 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
837 glBegin GL_QUADS;
838 glTexCoord 0, 0; glVertex 0 , 0;
839 glTexCoord 0, 1; glVertex 0 , $sh * 32;
840 glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
841 glTexCoord 1, 0; glVertex $sw4 * 32, 0;
842 glEnd;
595 843
596 glDisable GL_TEXTURE_2D; 844 glDisable GL_TEXTURE_2D;
597 glDisable GL_BLEND; 845 glDisable GL_BLEND;
598} 846}
599 847
646 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) { 894 if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
647 $::CONN->send ("command run_stop"); 895 $::CONN->send ("command run_stop");
648 } 896 }
649} 897}
650 898
899#############################################################################
900
901package Crossfire::Client::Widget::Animator;
902
903use SDL::OpenGL;
904
905our @ISA = Crossfire::Client::Widget::Bin::;
906
907sub moveto {
908 my ($self, $x, $y) = @_;
909
910 $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
911 $self->{speed} = 0.2;
912 $self->{time} = 1;
913
914 ::animation_start $self;
915}
916
917sub animate {
918 my ($self, $interval) = @_;
919
920 $self->{time} -= $interval * $self->{speed};
921 if ($self->{time} <= 0) {
922 $self->{time} = 0;
923 ::animation_stop $self;
924 }
925
926 my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
927
928 $self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
929 $self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
930}
931
932sub _draw {
933 my ($self) = @_;
934
935 glPushMatrix;
936 glRotate $self->{time} * 10000, 0, 1, 0;
937 $self->{children}[0]->draw;
938 glPopMatrix;
939}
940
6511; 9411;
652 942

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines