Skip to content

Commit 2fb96a1

Browse files
authored
Replace nodrop -> notallow to unify cursor themes (#452)
* Replace nodrop -> notallow to unify cursor themes X11 cursors are the only that use "nodrop" instead of "notallow" cursor. * Additional files * Get rid of duplicated cursors
1 parent d7e3986 commit 2fb96a1

File tree

16 files changed

+348
-656
lines changed

16 files changed

+348
-656
lines changed

main/vcl/inc/unx/x11_cursors/nodrop_curs.h

Lines changed: 0 additions & 60 deletions
This file was deleted.

main/vcl/inc/unx/x11_cursors/nodrop_mask.h

Lines changed: 0 additions & 60 deletions
This file was deleted.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**************************************************************
2+
*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*
20+
*************************************************************/
21+
22+
#define notallow_curs_width 32
23+
#define notallow_curs_height 32
24+
#define notallow_curs_x_hot 15
25+
#define notallow_curs_y_hot 15
26+
27+
static const unsigned char notallow_curs_bits[] = {
28+
0x00, 0x00, 0x00, 0x00,
29+
0x00, 0x00, 0x00, 0x00,
30+
0x00, 0x00, 0x00, 0x00,
31+
0x00, 0x00, 0x00, 0x00,
32+
0x00, 0x00, 0x00, 0x00,
33+
0x00, 0x00, 0x00, 0x00,
34+
0x00, 0x00, 0x00, 0x00,
35+
0x00, 0xe0, 0x07, 0x00,
36+
0x00, 0xf8, 0x1f, 0x00,
37+
0x00, 0x3c, 0x3c, 0x00,
38+
0x00, 0x0e, 0x70, 0x00,
39+
0x00, 0x1f, 0xe0, 0x00,
40+
0x00, 0x3b, 0xc0, 0x00,
41+
0x80, 0x73, 0xc0, 0x01,
42+
0x80, 0xe1, 0x80, 0x01,
43+
0x80, 0xc1, 0x81, 0x01,
44+
0x80, 0x81, 0x83, 0x01,
45+
0x80, 0x01, 0x87, 0x01,
46+
0x80, 0x03, 0xce, 0x01,
47+
0x00, 0x03, 0xdc, 0x00,
48+
0x00, 0x07, 0xf8, 0x00,
49+
0x00, 0x0e, 0x70, 0x00,
50+
0x00, 0x3c, 0x38, 0x00,
51+
0x00, 0xf8, 0x1f, 0x00,
52+
0x00, 0xe0, 0x07, 0x00,
53+
0x00, 0x00, 0x00, 0x00,
54+
0x00, 0x00, 0x00, 0x00,
55+
0x00, 0x00, 0x00, 0x00,
56+
0x00, 0x00, 0x00, 0x00,
57+
0x00, 0x00, 0x00, 0x00,
58+
0x00, 0x00, 0x00, 0x00,
59+
0x00, 0x00, 0x00, 0x00 };
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
/**************************************************************
2+
*
3+
* Licensed to the Apache Software Foundation (ASF) under one
4+
* or more contributor license agreements. See the NOTICE file
5+
* distributed with this work for additional information
6+
* regarding copyright ownership. The ASF licenses this file
7+
* to you under the Apache License, Version 2.0 (the
8+
* "License"); you may not use this file except in compliance
9+
* with the License. You may obtain a copy of the License at
10+
*
11+
* http://www.apache.org/licenses/LICENSE-2.0
12+
*
13+
* Unless required by applicable law or agreed to in writing,
14+
* software distributed under the License is distributed on an
15+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
* KIND, either express or implied. See the License for the
17+
* specific language governing permissions and limitations
18+
* under the License.
19+
*
20+
*************************************************************/
21+
22+
#define notallow_mask_width 32
23+
#define notallow_mask_height 32
24+
#define notallow_mask_x_hot 15
25+
#define notallow_mask_y_hot 15
26+
27+
static unsigned char notallow_mask_bits[] = {
28+
0x00, 0x00, 0x00, 0x00,
29+
0x00, 0x00, 0x00, 0x00,
30+
0x00, 0x00, 0x00, 0x00,
31+
0x00, 0x00, 0x00, 0x00,
32+
0x00, 0x00, 0x00, 0x00,
33+
0x00, 0x00, 0x00, 0x00,
34+
0x00, 0xe0, 0x07, 0x00,
35+
0x00, 0xf8, 0x1f, 0x00,
36+
0x00, 0xfc, 0x3f, 0x00,
37+
0x00, 0xfe, 0x7f, 0x00,
38+
0x00, 0x3f, 0xfc, 0x00,
39+
0x80, 0x3f, 0xf0, 0x01,
40+
0x80, 0x7f, 0xe0, 0x01,
41+
0xc0, 0xff, 0xe0, 0x03,
42+
0xc0, 0xf3, 0xc1, 0x03,
43+
0xc0, 0xe3, 0xc3, 0x03,
44+
0xc0, 0xc3, 0xc7, 0x03,
45+
0xc0, 0x83, 0xcf, 0x03,
46+
0xc0, 0x07, 0xff, 0x03,
47+
0x80, 0x07, 0xfe, 0x01,
48+
0x80, 0x0f, 0xfc, 0x01,
49+
0x00, 0x3f, 0xf8, 0x00,
50+
0x00, 0xfe, 0x7f, 0x00,
51+
0x00, 0xfc, 0x3f, 0x00,
52+
0x00, 0xf8, 0x1f, 0x00,
53+
0x00, 0xe0, 0x07, 0x00,
54+
0x00, 0x00, 0x00, 0x00,
55+
0x00, 0x00, 0x00, 0x00,
56+
0x00, 0x00, 0x00, 0x00,
57+
0x00, 0x00, 0x00, 0x00,
58+
0x00, 0x00, 0x00, 0x00,
59+
0x00, 0x00, 0x00, 0x00 };

main/vcl/inc/unx/x11_cursors/salcursors.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,8 @@
1919
*
2020
*************************************************************/
2121

22-
23-
24-
#include "unx/x11_cursors/nodrop_curs.h"
25-
#include "unx/x11_cursors/nodrop_mask.h"
22+
#include "unx/x11_cursors/notallow_curs.h"
23+
#include "unx/x11_cursors/notallow_mask.h"
2624
#include "unx/x11_cursors/magnify_curs.h"
2725
#include "unx/x11_cursors/magnify_mask.h"
2826
#include "unx/x11_cursors/rotate_curs.h"

0 commit comments

Comments
 (0)