`13883c8`

fix: use double-arrow cursors for tiled edge resize

Authored by mfwolffe <wolffemf@dukes.jmu.edu> 3 months ago

SHA: 13883c82b14b342b09074e83a42075c3f69e0140
Parents: b00c4be
Tree: 611e5f1

2 changed files

Status	File	+	-
M	`gar/src/x11/connection.rs`	11	1
M	`gar/src/x11/events.rs`	5	5

gar/src/x11/connection.rsmodified

      pub cursor_right: u32,
      pub cursor_top: u32,
      pub cursor_bottom: u32,
 +    pub cursor_h_double: u32,  // sb_h_double_arrow - horizontal resize
 +    pub cursor_v_double: u32,  // sb_v_double_arrow - vertical resize
+ }
  impl Connection {
              cursor_right,
              cursor_top,
              cursor_bottom,
 +            cursor_h_double,
 +            cursor_v_double,
          ) = Self::create_cursors(&conn)?;
          tracing::info!(
              cursor_right,
              cursor_top,
              cursor_bottom,
 +            cursor_h_double,
 +            cursor_v_double,
          })
+     }
+     }
      /// Create all cursors used by the window manager.
 -    fn create_cursors(conn: &RustConnection) -> Result<(u32, u32, u32, u32, u32, u32, u32, u32, u32, u32), Error> {
 +    fn create_cursors(conn: &RustConnection) -> Result<(u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32, u32), Error> {
          // Open the cursor font
          let font: Font = conn.generate_id()?;
          conn.open_font(font, b"cursor")?;
          let cursor_right = create(96)?;        // right_side
          let cursor_top = create(138)?;         // top_side
          let cursor_bottom = create(16)?;       // bottom_side
 +        let cursor_h_double = create(108)?;    // sb_h_double_arrow
 +        let cursor_v_double = create(116)?;    // sb_v_double_arrow
          // Close font (cursors keep their own references)
          conn.close_font(font)?;
              cursor_right,
              cursor_top,
              cursor_bottom,
 +            cursor_h_double,
 +            cursor_v_double,
          ))
+     }

gar/src/x11/events.rsmodified

                  });
                  let cursor = match direction {
 -                    Direction::Left | Direction::Right => self.conn.cursor_left,
 -                    Direction::Up | Direction::Down => self.conn.cursor_top,
 +                    Direction::Left | Direction::Right => self.conn.cursor_h_double,
 +                    Direction::Up | Direction::Down => self.conn.cursor_v_double,
                  };
                  self.conn.grab_pointer(Some(cursor))?;
                  return Ok(());
+         }
          if let Some(dir) = new_direction {
 -            // Set resize cursor on root
 +            // Set resize cursor on root (double-arrow cursors)
              let cursor = match dir {
 -                Direction::Left | Direction::Right => self.conn.cursor_left,
 -                Direction::Up | Direction::Down => self.conn.cursor_top,
 +                Direction::Left | Direction::Right => self.conn.cursor_h_double,
 +                Direction::Up | Direction::Down => self.conn.cursor_v_double,
              };
              self.conn.set_window_cursor(self.conn.root, cursor)?;
              self.conn.flush()?;